Mark member access to constants as pure and fix cross contract cyclic…

… dependency check.
ethereum · Apr 12, 2018 · 2290134 · 2290134
1 parent 28feee6
commit 2290134
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/libsolidity/analysis/PostTypeChecker.cpp b/libsolidity/analysis/PostTypeChecker.cpp
@@ -33,20 +33,13 @@ using namespace dev::solidity;
 
 
 bool PostTypeChecker::check(ASTNode const& _astRoot)
-{
-	_astRoot.accept(*this);
-	return Error::containsOnlyWarnings(m_errorReporter.errors());
-}
-
-bool PostTypeChecker::visit(ContractDefinition const&)
 {
 	solAssert(!m_currentConstVariable, "");
+	solAssert(m_constVariables.empty(), "");
 	solAssert(m_constVariableDependencies.empty(), "");
-	return true;
-}
 
-void PostTypeChecker::endVisit(ContractDefinition const&)
-{
+	_astRoot.accept(*this);
+
 	solAssert(!m_currentConstVariable, "");
 	for (auto declaration: m_constVariables)
 		if (auto identifier = findCycle(*declaration))
@@ -58,6 +51,7 @@ void PostTypeChecker::endVisit(ContractDefinition const&)
 
 	m_constVariables.clear();
 	m_constVariableDependencies.clear();
+	return Error::containsOnlyWarnings(m_errorReporter.errors());
 }
 
 bool PostTypeChecker::visit(VariableDeclaration const& _variable)
@@ -89,6 +83,15 @@ bool PostTypeChecker::visit(Identifier const& _identifier)
 	return true;
 }
 
+bool PostTypeChecker::visit(MemberAccess const &_memberAccess)
+{
+	if (m_currentConstVariable)
+		if (auto var = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
+			if (var->isConstant())
+				m_constVariableDependencies[m_currentConstVariable].insert(var);
+	return true;
+}
+
 VariableDeclaration const* PostTypeChecker::findCycle(VariableDeclaration const& _startingFrom)
 {
 	auto visitor = [&](VariableDeclaration const& _variable, CycleDetector<VariableDeclaration>& _cycleDetector)

diff --git a/libsolidity/analysis/PostTypeChecker.h b/libsolidity/analysis/PostTypeChecker.h
@@ -47,13 +47,11 @@ class PostTypeChecker: private ASTConstVisitor
 	/// Adds a new error to the list of errors.
 	void typeError(SourceLocation const& _location, std::string const& _description);
 
-	virtual bool visit(ContractDefinition const& _contract) override;
-	virtual void endVisit(ContractDefinition const& _contract) override;
-
 	virtual bool visit(VariableDeclaration const& _variable) override;
 	virtual void endVisit(VariableDeclaration const& _variable) override;
 
 	virtual bool visit(Identifier const& _identifier) override;
+	virtual bool visit(MemberAccess const& _memberAccess) override;
 
 	VariableDeclaration const* findCycle(VariableDeclaration const& _startingFrom);
 

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
@@ -1994,6 +1994,10 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 		if (tt->actualType()->category() == Type::Category::Enum)
 			annotation.isPure = true;
 
+	if (auto var = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
+		if (var->isConstant())
+			annotation.isPure = true;
+
 	return false;
 }
 

diff --git a/test/libsolidity/syntaxTests/constants/cross_contract_cyclic_dependency.sol b/test/libsolidity/syntaxTests/constants/cross_contract_cyclic_dependency.sol
@@ -5,4 +5,5 @@ contract B {
     uint constant c = A.c;
 }
 // ----
-// Some Error: This should fail with some error!
+// TypeError: (17-38): The value of the constant c has a cyclic dependency via c.
+// TypeError: (59-80): The value of the constant c has a cyclic dependency via c.