add shortcut for Arithmetic error in ANY_EXCEPTION_MESSAGE

digital-asset · May 26, 2021 · b44f8b0 · b44f8b0
1 parent 2b9de6b
commit b44f8b0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala b/daml-lf/interpreter/src/main/scala/com/digitalasset/daml/lf/speedy/SBuiltin.scala
@@ -1574,6 +1574,9 @@ private[lf] object SBuiltin {
         machine: Machine,
     ): Unit = {
       getSAnyException(args, 0) match {
+        case SArithmeticError(value) =>
+          // short cut for Arithmetic error
+          machine.returnValue = value
         case SAnyException(Ast.TTyCon(tyCon), innerValue) =>
           if (!machine.compiledPackages.packageIds.contains(tyCon.packageId))
             throw SpeedyHungry(

diff --git a/daml-lf/interpreter/src/test/scala/com/digitalasset/daml/lf/speedy/SBuiltinTest.scala b/daml-lf/interpreter/src/test/scala/com/digitalasset/daml/lf/speedy/SBuiltinTest.scala
@@ -1492,13 +1492,19 @@ class SBuiltinTest extends AnyFreeSpec with Matchers with TableDrivenPropertyChe
         e"""ANY_EXCEPTION_MESSAGE (to_any_exception @Mod:Exception (Mod:Exception {}))"""
       ) shouldBe Right(SText("some nice error message"))
       // FIXME: should be
-      //    e"""ANY_EXCEPTION_MESSAGE (to_any_exception @'-unknown-package-':Mod:Exception ('-unknown-package-'Mod:Exception {}))"""
+      //    e"""ANY_EXCEPTION_MESSAGE (to_any_exception @'-unknown-package-':Mod:Exception ('-unknown-package-':Mod:Exception {}))"""
       //   but the parser seems buggy.
       eval(
         e"""ANY_EXCEPTION_MESSAGE (to_any_exception @'-unknown-package-':Mod:Exception (Mod:Exception {}))"""
       ) shouldBe Left(SErrorCrash(s"need package '-unknown-package-'"))
     }
 
+    s"should not request package for ArithmeticError" in {
+      eval(
+        e"""ANY_EXCEPTION_MESSAGE (to_any_exception @'f1cf1ff41057ce327248684089b106d0a1f27c2f092d30f663c919addf173981':DA.Exception.ArithmeticError:ArithmeticError (DA.Exception.ArithmeticError:ArithmeticError { message = "Arithmetic error" }))"""
+      ) shouldBe Right(SText("Arithmetic error"))
+    }
+
   }
 
 }