fix it for realsies

OpenDreamProject · Nov 16, 2024 · 2bf720e · 2bf720e
1 parent 5b41f9d
commit 2bf720e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/DMCompiler/Optimizer/AnnotatedBytecode.cs b/DMCompiler/Optimizer/AnnotatedBytecode.cs
@@ -236,8 +236,8 @@ public Location GetLocation() {
         return Location;
     }
 
-    public string ResolveString() {
-        return DMObjectTree.StringTable[Id];
+    public string ResolveString(DMCompiler compiler) {
+        return compiler.DMObjectTree.StringTable[Id];
     }
 }
 

diff --git a/DMCompiler/Optimizer/PeepholeOptimizations.cs b/DMCompiler/Optimizer/PeepholeOptimizations.cs
@@ -786,7 +786,7 @@ public void Apply(DMCompiler compiler, List<IAnnotatedBytecode> input, int index
         var firstString = firstInstruction.GetArg<AnnotatedBytecodeString>(0);
         var secondString = ((AnnotatedBytecodeInstruction)input[index+1]).GetArg<AnnotatedBytecodeString>(0);
 
-        var combinedId = DMObjectTree.AddString(firstString.ResolveString() + secondString.ResolveString()); // TODO: Currently doesn't handle removing strings from the string tree that have no other references
+        var combinedId = compiler.DMObjectTree.AddString(firstString.ResolveString(compiler) + secondString.ResolveString(compiler)); // TODO: Currently doesn't handle removing strings from the string tree that have no other references
 
         var args = new List<IAnnotatedBytecode>(1) {new AnnotatedBytecodeString(combinedId, firstInstruction.Location)};