Commit 02037d5a authored by John Zhang's avatar John Zhang

submit two patches: original ANTLR4 generated parser package patch has problem...

submit two patches: original ANTLR4 generated parser package patch has problem with IntelliJ classpath for some reason, this antlr4-package-path.patch fixes it; issuemir2-uptr-hack commit as an optional patch.
parent 52ed1a5f
diff --git a/src/main/scala/uvm/ir/textinput/UIRTextReader.scala b/src/main/scala/uvm/ir/textinput/UIRTextReader.scala
index e00574c..5d3e09b 100644
--- a/src/main/scala/uvm/ir/textinput/UIRTextReader.scala
+++ b/src/main/scala/uvm/ir/textinput/UIRTextReader.scala
@@ -11,9 +11,9 @@ import com.typesafe.scalalogging.Logger
import uvm._
import uvm.comminsts.CommInsts
-import uvm.ir.textinput.gen._
-import uvm.ir.textinput.gen.UIRParser._
-import uvm.ir.textinput.gen.UIRParser.StringLiteralContext
+import antlr4.uvm.ir.textinput.gen._
+import antlr4.uvm.ir.textinput.gen.UIRParser._
+import antlr4.uvm.ir.textinput.gen.UIRParser.StringLiteralContext
import uvm.ssavariables._
import uvm.types._
import uvm.utils.AdvancedAntlrHelper
diff --git a/src/main/scala/uvm/refimpl/hail/HailScriptLoader.scala b/src/main/scala/uvm/refimpl/hail/HailScriptLoader.scala
index a0b4aca..53897d3 100644
--- a/src/main/scala/uvm/refimpl/hail/HailScriptLoader.scala
+++ b/src/main/scala/uvm/refimpl/hail/HailScriptLoader.scala
@@ -14,9 +14,9 @@ import com.typesafe.scalalogging.Logger
import uvm._
import uvm.ir.textinput.TextIRParsingException
-import uvm.ir.textinput.gen.HAILLexer
-import uvm.ir.textinput.gen.HAILParser
-import uvm.ir.textinput.gen.HAILParser._
+import antlr4.uvm.ir.textinput.gen.HAILLexer
+import antlr4.uvm.ir.textinput.gen.HAILParser
+import antlr4.uvm.ir.textinput.gen.HAILParser._
import uvm.refimpl._
import uvm.refimpl.mem.HeaderUtils
import uvm.refimpl.mem.MemorySupport
diff --git a/src/main/scala/uvm/refimpl/itpr/operationHelpers.scala b/src/main/scala/uvm/refimpl/itpr/operationHelpers.scala
index 4fecd6e..5f2e90c 100644
--- a/src/main/scala/uvm/refimpl/itpr/operationHelpers.scala
+++ b/src/main/scala/uvm/refimpl/itpr/operationHelpers.scala
@@ -363,7 +363,10 @@ object MemoryOperations {
def noAccessViaPointer(ptr: Boolean, ty: Type) {
if (ptr) {
- throw new UvmIllegalMemoryAccessException("Cannot access type %s via pointer".format(ty.repr))
+ // HACK: We allow loading/storing traced references via uptr to workaround a design mismatch
+ // in PyPy. See https://gitlab.anu.edu.au/mu/mu-impl-ref2/issues/2
+
+ // throw new UvmIllegalMemoryAccessException("Cannot access type %s via pointer".format(ty.repr))
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment