Inline method

trunk/source/IcfgBuilder/src/de/uni_freiburg/informatik/ultimate/plugins/generator/icfgbuilder/cfg/CfgBuilder.java

@@ -1120,11 +1120,6 @@ private BoogieIcfgLocation buildJoin(final BoogieIcfgLocation currentLocation, f
 			return newLocation;
 		}
 
-		private IIcfgElement beginAtomicBlockFromBottom(final BoogieIcfgLocation currentLocation) {
-			AtomicBlockInfo.addEndAnnotation(currentLocation);
-			return currentLocation;
-		}
-
 		private BoogieIcfgLocation endAtomicBlockAtTop(IIcfgElement curElement, final Statement st) {
 			if (!(curElement instanceof StatementSequence)) {
 				curElement = startNewStatementSequence((BoogieIcfgLocation) curElement, Origin.IMPLEMENTATION);
@@ -1142,8 +1137,8 @@ private BoogieIcfgLocation endAtomicBlockAtTop(IIcfgElement curElement, final St
 		}
 
 		private BoogieIcfgLocation buildAtomic(final BoogieIcfgLocation currentLocation, final AtomicStatement st) {
-			IIcfgElement curElement = beginAtomicBlockFromBottom(currentLocation);
-			curElement = buildCodeBlock(st.getBody(), curElement, false);
+			AtomicBlockInfo.addEndAnnotation(currentLocation);
+			final IIcfgElement curElement = buildCodeBlock(st.getBody(), currentLocation, false);
 			return endAtomicBlockAtTop(curElement, st);
 		}
 
@@ -1161,7 +1156,8 @@ private IIcfgElement buildCall(final IIcfgElement currentLocation, final CallSta
 				} else {
 					throw new AssertionError("Expected StatementSequence or BoogieIcfgLocation");
 				}
-				return beginAtomicBlockFromBottom(locAfterAtomicBlock);
+				AtomicBlockInfo.addEndAnnotation(locAfterAtomicBlock);
+				return locAfterAtomicBlock;
 			}
 
 			final List<RequiresSpecification> requiresNonFree = mBoogieDeclarations.getRequiresNonFree().get(callee);