1 files changed, 8 insertions, 8 deletions

diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index 85a88c03..20d59a04 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -101,7 +101,7 @@ public:
 		return state;
 	}
 
-	AssemblyItems getCSE(AssemblyItems const& _input, eth::KnownState const& _state = eth::KnownState())
+	AssemblyItems CSE(AssemblyItems const& _input, eth::KnownState const& _state = eth::KnownState())
 	{
 		AssemblyItems input = addDummyLocations(_input);
 
@@ -111,7 +111,7 @@ public:
 
 		for (AssemblyItem const& item: output)
 		{
-			BOOST_CHECK(item == Instruction::POP || !item.getLocation().isEmpty());
+			BOOST_CHECK(item == Instruction::POP || !item.location().isEmpty());
 		}
 		return output;
 	}
@@ -122,11 +122,11 @@ public:
 		KnownState const& _state = eth::KnownState()
 	)
 	{
-		AssemblyItems output = getCSE(_input, _state);
+		AssemblyItems output = CSE(_input, _state);
 		BOOST_CHECK_EQUAL_COLLECTIONS(_expectation.begin(), _expectation.end(), output.begin(), output.end());
 	}
 
-	AssemblyItems getCFG(AssemblyItems const& _input)
+	AssemblyItems CFG(AssemblyItems const& _input)
 	{
 		AssemblyItems output = _input;
 		// Running it four times should be enough for these tests.
@@ -144,7 +144,7 @@ public:
 
 	void checkCFG(AssemblyItems const& _input, AssemblyItems const& _expectation)
 	{
-		AssemblyItems output = getCFG(_input);
+		AssemblyItems output = CFG(_input);
 		BOOST_CHECK_EQUAL_COLLECTIONS(_expectation.begin(), _expectation.end(), output.begin(), output.end());
 	}
 
@@ -890,7 +890,7 @@ BOOST_AUTO_TEST_CASE(cse_sha3_twice_same_content_noninterfering_store_in_between
 		Instruction::SHA3 // sha3(m[12..(12+32)])
 	};
 	// if this changes too often, only count the number of SHA3 and MSTORE instructions
-	AssemblyItems output = getCSE(input);
+	AssemblyItems output = CSE(input);
 	BOOST_CHECK_EQUAL(4, count(output.begin(), output.end(), AssemblyItem(Instruction::MSTORE)));
 	BOOST_CHECK_EQUAL(1, count(output.begin(), output.end(), AssemblyItem(Instruction::SHA3)));
 }
@@ -914,7 +914,7 @@ BOOST_AUTO_TEST_CASE(cse_equality_on_initially_known_stack)
 	AssemblyItems input{
 		Instruction::EQ
 	};
-	AssemblyItems output = getCSE(input, state);
+	AssemblyItems output = CSE(input, state);
 	// check that it directly pushes 1 (true)
 	BOOST_CHECK(find(output.begin(), output.end(), AssemblyItem(u256(1))) != output.end());
 }
@@ -938,7 +938,7 @@ BOOST_AUTO_TEST_CASE(cse_access_previous_sequence)
 		u256(0),
 		Instruction::SLOAD,
 	};
-	BOOST_CHECK_THROW(getCSE(input, state), StackTooDeepException);
+	BOOST_CHECK_THROW(CSE(input, state), StackTooDeepException);
 	// @todo for now, this throws an exception, but it should recover to the following
 	// (or an even better version) at some point:
 	// 0, SLOAD, 1, ADD, SSTORE, 0 SLOAD