Remove old closure-conversion code & diff-check between old/new.

digital-asset · Nov 22, 2021 · 2ecdfa4 · 2ecdfa4
1 parent e6d1cd1
commit 2ecdfa4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 191 deletions.
diff --git a/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/ClosureConversion.scala b/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/ClosureConversion.scala
diff --git a/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/Compiler.scala b/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/Compiler.scala
@@ -15,8 +15,7 @@ import com.daml.lf.speedy.SBuiltin._
 import com.daml.lf.speedy.SValue._
 import com.daml.lf.speedy.{SExpr0 => s}
 import com.daml.lf.speedy.{SExpr => t}
-import com.daml.lf.speedy.{ClosureConversion => oldCC}
-import com.daml.lf.speedy.{ClosureConversionStackSafe => newCC}
+import com.daml.lf.speedy.ClosureConversionStackSafe.closureConvert
 import com.daml.lf.speedy.ValidateCompilation.validateCompilation
 import com.daml.lf.validation.{EUnknownDefinition, Validation, ValidationError}
 import com.daml.scalautil.Statement.discard
@@ -349,15 +348,6 @@ private[lf] final class Compiler(
   private[this] def compilationPipeline(sexpr: s.SExpr): t.SExpr =
     flattenToAnf(closureConvert(sexpr))
 
-  private[this] def closureConvert(exp: s.SExpr): SExpr1.SExpr = { //NICK: remove this diff check
-    val res1 = oldCC.closureConvert(exp)
-    val res2 = newCC.closureConvert(exp)
-    if (res1 != res2) {
-      sys.error(s"closureConvert(DIFF check FAIL):\nv1=$res1\nv2=$res2")
-    }
-    res2
-  }
-
   @throws[PackageNotFound]
   @throws[CompilationError]
   def unsafeCompileModule(

diff --git a/daml-lf/interpreter/src/test/scala/com/digitalasset/daml/lf/speedy/StackSafetyTest.scala b/daml-lf/interpreter/src/test/scala/com/digitalasset/daml/lf/speedy/StackSafetyTest.scala
@@ -39,7 +39,6 @@ class StackSafetyTest extends AnyFreeSpec with Matchers with TableDrivenProperty
 
     // This is the code under test...
     def transform(e: SExpr): target.SExpr = {
-      //import com.daml.lf.speedy.ClosureConversion.closureConvert //old stack-unsafe code would fail
       import com.daml.lf.speedy.ClosureConversionStackSafe.closureConvert
       closureConvert(e)
     }