- factor out index calculation into #indexFromIRFromScope:

- add an assert as I think the parameter is not needed (we look up the var in the scope, those vars know the scope!) - readFromContext:scope: should never be called on VectorTempVariable: add #isThisEverCalled:
astares · Sep 19, 2019 · cf79b37 · cf79b37
1 parent e265582
commit cf79b37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/OpalCompiler-Core/OCTempVariable.class.st b/src/OpalCompiler-Core/OCTempVariable.class.st
@@ -134,7 +134,8 @@ OCTempVariable >> markWrite [
 
 { #category : #debugging }
 OCTempVariable >> readFromContext: aContext scope: contextScope [
-	^ aContext tempAt: (contextScope outerNotOptimizedScope node irInstruction indexForVarNamed: name)
+
+	^ aContext tempAt: (self indexFromIRFromScope: contextScope)
 ]
 
 { #category : #debugging }
@@ -146,6 +147,6 @@ OCTempVariable >> searchFromContext: aContext scope: contextScope [
 { #category : #debugging }
 OCTempVariable >> writeFromContext: aContext scope: contextScope value: aValue [
 	^aContext 
-		tempAt: (contextScope outerNotOptimizedScope node irInstruction indexForVarNamed: name) 
+		tempAt: (self indexFromIRFromScope: contextScope) 
 		put: aValue
 ]
diff --git a/src/OpalCompiler-Core/OCVectorTempVariable.class.st b/src/OpalCompiler-Core/OCVectorTempVariable.class.st
@@ -36,6 +36,7 @@ OCVectorTempVariable >> isTempVectorTemp [
 OCVectorTempVariable >> readFromContext: aContext scope: contextScope [
 
 	| offset pairVariableVector |
+	self isThisEverCalled: 'this should never be called on vector temps'.
 	pairVariableVector := contextScope lookupTempVector: vectorName inContext: aContext.
 	offset := pairVariableVector first indexInTempVectorFromIR: name.
 	^pairVariableVector second at: offset.