Improve fallback code of Interop#instantiate:with:

hpi-swa · Jun 10, 2021 · a766019 · a766019
1 parent 2378981
commit a766019
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/TruffleSqueak-Core.package/Interop.class/class/instantiate.with..st b/src/TruffleSqueak-Core.package/Interop.class/class/instantiate.with..st
@@ -2,5 +2,7 @@ primitives instantiables
 instantiate: anObject with: arguments
 	<primitive: 'primitiveInstantiate' module: 'PolyglotPlugin'>
 	^ (self isInstantiable: anObject)
-		ifTrue: [ anObject interopInstantiate: arguments ]
+		ifTrue: [ anObject isForeignObject
+			ifTrue: [ Polyglot signalPolyglotError ]
+			ifFalse: [ anObject interopInstantiate: arguments ] ]
 		ifFalse: [ self error: 'Object is not instantiable' ]
diff --git a/src/TruffleSqueak-Core.package/Interop.class/methodProperties.json b/src/TruffleSqueak-Core.package/Interop.class/methodProperties.json
@@ -60,7 +60,7 @@
 		"hasSourceLocation:" : "fn 3/5/2021 14:43",
 		"hostIdentityHashCode:" : "fn 2/11/2021 12:04",
 		"identityHashCode:" : "fn 3/9/2021 16:49",
-		"instantiate:with:" : "fn 3/9/2021 12:40",
+		"instantiate:with:" : "fn 6/10/2021 14:01",
 		"invokeMember:member:arguments:" : "fn 3/11/2021 09:48",
 		"isArrayElementExisting:index:" : "fn 3/5/2021 14:44",
 		"isArrayElementInsertable:index:" : "fn 3/5/2021 14:52",