4 files changed, 23 insertions, 6 deletions
diff --git a/libsolidity/codegen/Compiler.cpp b/libsolidity/codegen/Compiler.cpp
index 1ae5dda9..bb8211ad 100644
--- a/libsolidity/codegen/Compiler.cpp
+++ b/libsolidity/codegen/Compiler.cpp
@@ -33,10 +33,10 @@ void Compiler::compileContract(
 	std::map<const ContractDefinition*, eth::Assembly const*> const& _contracts
 )
 {
-	ContractCompiler runtimeCompiler(m_runtimeContext, m_optimize);
+	ContractCompiler runtimeCompiler(CompilationMode::Runtime, nullptr, m_runtimeContext, m_optimize);
 	runtimeCompiler.compileContract(_contract, _contracts);
 
-	ContractCompiler creationCompiler(m_context, m_optimize);
+	ContractCompiler creationCompiler(CompilationMode::Creation, &m_runtimeContext, m_context, m_optimize);
 	m_runtimeSub = creationCompiler.compileConstructor(m_runtimeContext, _contract, _contracts);
 
 	if (m_optimize)
@@ -54,7 +54,7 @@ void Compiler::compileClone(
 	map<ContractDefinition const*, eth::Assembly const*> const& _contracts
 )
 {
-	ContractCompiler cloneCompiler(m_context, m_optimize);
+	ContractCompiler cloneCompiler(CompilationMode::Creation, &m_runtimeContext, m_context, m_optimize);
 	m_runtimeSub = cloneCompiler.compileClone(_contract, _contracts);
 
 	if (m_optimize)
diff --git a/libsolidity/codegen/Compiler.h b/libsolidity/codegen/Compiler.h
index fccb68a9..56849ea0 100644
--- a/libsolidity/codegen/Compiler.h
+++ b/libsolidity/codegen/Compiler.h
@@ -35,7 +35,9 @@ class Compiler
 public:
 	explicit Compiler(bool _optimize = false, unsigned _runs = 200):
 		m_optimize(_optimize),
-		m_optimizeRuns(_runs)
+		m_optimizeRuns(_runs),
+		m_context(CompilationMode::Creation, &m_runtimeContext),
+		m_runtimeContext(CompilationMode::Runtime)
 	{ }
 
 	void compileContract(
diff --git a/libsolidity/codegen/CompilerContext.h b/libsolidity/codegen/CompilerContext.h
index 6c509685..8b95c9f5 100644
--- a/libsolidity/codegen/CompilerContext.h
+++ b/libsolidity/codegen/CompilerContext.h
@@ -37,6 +37,10 @@ namespace dev {
 namespace solidity {
 
 
+/// Depending on the compilation is on the runtime code or the creation code,
+/// the interpretation of internal function values differ.
+enum class CompilationMode { Runtime, Creation };
+
 /**
  * Context to be shared by all units that compile the same contract.
  * It stores the generated bytecode and the position of identifiers in memory and on the stack.
@@ -44,6 +48,13 @@ namespace solidity {
 class CompilerContext
 {
 public:
+	CompilerContext(CompilationMode _mode, CompilerContext* _runtimeContext = nullptr) :
+		m_mode(_mode), m_runtimeContext(_runtimeContext)
+	{
+		solAssert(m_mode != CompilationMode::Runtime || !m_runtimeContext, "runtime but another runtime context provided");
+		solAssert(m_mode != CompilationMode::Creation || m_runtimeContext, "creation but no runtime context provided");
+	}
+
 	bool isCreationPhase() const { return m_mode == CompilationMode::Creation; }
 
 	void addMagicGlobal(MagicVariableDeclaration const& _declaration);
@@ -230,6 +241,10 @@ private:
 	std::vector<ContractDefinition const*> m_inheritanceHierarchy;
 	/// Stack of current visited AST nodes, used for location attachment
 	std::stack<ASTNode const*> m_visitedNodes;
+	/// The current mode of the compilation
+	CompilationMode m_mode;
+	/// The runtime context if in Creation mode, this is used for generating tags that would be stored into the storage and then used at runtime.
+	CompilerContext *m_runtimeContext;
 };
 
 }
diff --git a/libsolidity/codegen/ContractCompiler.h b/libsolidity/codegen/ContractCompiler.h
index 0799a543..fecf6f5a 100644
--- a/libsolidity/codegen/ContractCompiler.h
+++ b/libsolidity/codegen/ContractCompiler.h
@@ -38,11 +38,11 @@ namespace solidity {
 class ContractCompiler: private ASTConstVisitor
 {
 public:
-	explicit ContractCompiler(CompilerContext& _context, bool _optimise):
+	explicit ContractCompiler(CompilationMode _mode, CompilerContext* _runtimeContext, CompilerContext& _context, bool _optimise):
 		m_optimise(_optimise),
 		m_context(_context)
 	{
-		m_context = CompilerContext();
+		m_context = CompilerContext(_mode, _runtimeContext);
 	}
 
 	void compileContract(