1 files changed, 57 insertions, 0 deletions
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 44f4629b..c63b6b5a 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -24,6 +24,8 @@
 #include <memory>
 #include <boost/range/adaptor/reversed.hpp>
 #include <libsolidity/ast/AST.h>
+#include <libevmasm/Assembly.h> // needed for inline assembly
+#include <libsolidity/inlineasm/AsmCodeGen.h>
 
 using namespace std;
 using namespace dev;
@@ -547,6 +549,61 @@ bool TypeChecker::visit(EventDefinition const& _eventDef)
 	return false;
 }
 
+bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
+{
+	// Inline assembly does not have its own type-checking phase, so we just run the
+	// code-generator and see whether it produces any errors.
+	// External references have already been resolved in a prior stage and stored in the annotation.
+	assembly::CodeGenerator codeGen(_inlineAssembly.operations(), m_errors);
+	codeGen.typeCheck([&](assembly::Identifier const& _identifier, eth::Assembly& _assembly, assembly::CodeGenerator::IdentifierContext _context) {
+		auto ref = _inlineAssembly.annotation().externalReferences.find(&_identifier);
+		if (ref == _inlineAssembly.annotation().externalReferences.end())
+			return false;
+		Declaration const* declaration = ref->second;
+		solAssert(!!declaration, "");
+		if (_context == assembly::CodeGenerator::IdentifierContext::RValue)
+		{
+			solAssert(!!declaration->type(), "Type of declaration required but not yet determined.");
+			unsigned pushes = 0;
+			if (dynamic_cast<FunctionDefinition const*>(declaration))
+				pushes = 1;
+			else if (auto var = dynamic_cast<VariableDeclaration const*>(declaration))
+			{
+				if (var->isConstant())
+					fatalTypeError(SourceLocation(), "Constant variables not yet implemented for inline assembly.");
+				if (var->isLocalVariable())
+					pushes = var->type()->sizeOnStack();
+				else if (var->type()->isValueType())
+					pushes = 1;
+				else
+					pushes = 2; // slot number, intra slot offset
+			}
+			else if (auto contract = dynamic_cast<ContractDefinition const*>(declaration))
+			{
+				if (!contract->isLibrary())
+					return false;
+				pushes = 1;
+			}
+			for (unsigned i = 0; i < pushes; ++i)
+				_assembly.append(u256(0)); // just to verify the stack height
+		}
+		else
+		{
+			// lvalue context
+			if (auto varDecl = dynamic_cast<VariableDeclaration const*>(declaration))
+			{
+				if (!varDecl->isLocalVariable())
+					return false; // only local variables are inline-assemlby lvalues
+				for (unsigned i = 0; i < declaration->type()->sizeOnStack(); ++i)
+					_assembly.append(eth::Instruction::POP); // remove value just to verify the stack height
+			}
+			else
+				return false;
+		}
+		return true;
+	});
+	return false;
+}
 
 bool TypeChecker::visit(IfStatement const& _ifStatement)
 {