Merge pull request wren-lang#698 from matusnovak/fix-foreign-allocate-abort-fiber

ruby0x1 · web-flow · commit e94c813ecc51 · 2019-09-17T11:08:37.000-07:00
Fix wrenAbortFiber does not work inside of foreign class allocator
diff --git a/src/vm/wren_vm.c b/src/vm/wren_vm.c
@@ -1198,6 +1198,7 @@ static WrenInterpretResult runInterpreter(WrenVM* vm, register ObjFiber* fiber)
     CASE_CODE(FOREIGN_CONSTRUCT):
       ASSERT(IS_CLASS(stackStart[0]), "'this' should be a class.");
       createForeign(vm, fiber, stackStart);
+      if (wrenHasError(fiber)) RUNTIME_ERROR();
       DISPATCH();
 
     CASE_CODE(CLOSURE):
diff --git a/test/api/foreign_class.c b/test/api/foreign_class.c
@@ -82,6 +82,13 @@ static void resourceFinalize(void* data)
   finalized++;
 }
 
+static void badClassAllocate(WrenVM* vm)
+{
+  wrenEnsureSlots(vm, 1);
+  wrenSetSlotString(vm, 0, "Something went wrong");
+  wrenAbortFiber(vm, 0);
+}
+
 WrenForeignMethodFn foreignClassBindMethod(const char* signature)
 {
   if (strcmp(signature, "static ForeignClass.finalized") == 0) return apiFinalized;
@@ -114,4 +121,10 @@ void foreignClassBindClass(
     methods->finalize = resourceFinalize;
     return;
   }
+
+  if (strcmp(className, "BadClass") == 0)
+  {
+    methods->allocate = badClassAllocate;
+    return;
+  }
 }
diff --git a/test/api/foreign_class.wren b/test/api/foreign_class.wren
@@ -75,3 +75,13 @@ resources.clear()
 
 System.gc()
 System.print(ForeignClass.finalized) // expect: 3
+
+// Class that aborts fiber
+foreign class BadClass {
+  construct new() {}
+}
+
+error = Fiber.new {
+  BadClass.new()
+}.try()
+System.print(error) // expect: Something went wrong

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,13 @@ static void resourceFinalize(void* data)`
`82`	`82`	`finalized++;`
`83`	`83`	`}`
`84`	`84`
	`85`	`+static void badClassAllocate(WrenVM* vm)`
	`86`	`+{`
	`87`	`+ wrenEnsureSlots(vm, 1);`
	`88`	`+ wrenSetSlotString(vm, 0, "Something went wrong");`
	`89`	`+ wrenAbortFiber(vm, 0);`
	`90`	`+}`
	`91`	`+`
`85`	`92`	`WrenForeignMethodFn foreignClassBindMethod(const char* signature)`
`86`	`93`	`{`
`87`	`94`	`if (strcmp(signature, "static ForeignClass.finalized") == 0) return apiFinalized;`
`@@ -114,4 +121,10 @@ void foreignClassBindClass(`
`114`	`121`	`methods->finalize = resourceFinalize;`
`115`	`122`	`return;`
`116`	`123`	`}`
	`124`	`+`
	`125`	`+ if (strcmp(className, "BadClass") == 0)`
	`126`	`+ {`
	`127`	`+ methods->allocate = badClassAllocate;`
	`128`	`+ return;`
	`129`	`+ }`
`117`	`130`	`}`