fixes

UQ-PAC · Nov 15, 2024 · 9769403 · 9769403
1 parent 23c9fb6
commit 9769403
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/scala/analysis/data_structure_analysis/Graph.scala b/src/main/scala/analysis/data_structure_analysis/Graph.scala
@@ -682,7 +682,7 @@ class Graph(val proc: Procedure,
   }
 
   def SSAVar(posLabel:String, varName: String): Slice = {
-    assert(posLabel.matches("%[0-9]{8}"))
+    assert(posLabel.matches("%[0-9]{8}?\\$\\d"))
 
     val res = varToCell.keys.filter(pos => pos.toShortString.startsWith(posLabel))
     assert(res.size == 1)

diff --git a/src/test/scala/DataStructureAnalysisTest.scala b/src/test/scala/DataStructureAnalysisTest.scala
@@ -89,8 +89,8 @@ class DataStructureAnalysisTest extends AnyFunSuite {
     assert(dsg.find(dsg.globalMapping(AddressRange(1876, 1876)).node.cells(0)).offset.equals(0))
     assert(dsg.find(dsg.globalMapping(AddressRange(1896, 1896)).node.cells(0)).offset.equals(8))
 
-    assert(dsg.adjust(dsg.SSAVar("%00000429", "R8")).equals(dsg.find(dsg.globalMapping(AddressRange(1876, 1876)).node.cells(0))))
-    assert(dsg.adjust(dsg.SSAVar("%00000438", "R8")).equals(dsg.find(dsg.globalMapping(AddressRange(1896, 1896)).node.cells(0))))
+    assert(dsg.adjust(dsg.SSAVar("%00000429$1", "R8")).equals(dsg.find(dsg.globalMapping(AddressRange(1876, 1876)).node.cells(0))))
+    assert(dsg.adjust(dsg.SSAVar("%00000438$1", "R8")).equals(dsg.find(dsg.globalMapping(AddressRange(1896, 1896)).node.cells(0))))