Lower core instance checks to type assertions

Author: jfhamlin

pkg/runtime/codegen.go

@@ -1964,9 +1964,15 @@ func (g *Generator) generateInvokeDefault(invokeNode *ast.InvokeNode) string {
 
 	// Generate the arguments
 	var argExprs []string
-	skipInstanceType := externalTarget != nil &&
-		externalTarget.directLinked &&
-		externalTarget.intrinsic == "instance?"
+	_, staticInstance := g.staticInstanceCall(
+		invokeNode,
+		[]string{"", "value"},
+	)
+	skipInstanceType := staticInstance &&
+		((aotTarget != nil && aotTarget.directLinked) ||
+			(externalTarget != nil &&
+				externalTarget.directLinked &&
+				externalTarget.intrinsic == "instance?"))
 	for index, arg := range invokeNode.Args {
 		if skipInstanceType && index == 0 {
 			argExprs = append(argExprs, "")
@@ -2004,6 +2010,10 @@ func (g *Generator) generateInvokeDefault(invokeNode *ast.InvokeNode) string {
 	}
 	if aotTarget != nil {
 		if aotTarget.directLinked {
+			if instanceCall, ok := g.staticInstanceCall(invokeNode, argExprs); ok {
+				g.writef("%s := %s\n", resultVar, instanceCall)
+				return resultVar
+			}
 			if slot := aotTarget.directArityVars[len(argExprs)]; slot != "" {
 				g.writef("%s := %s(%s)\n",
 					resultVar,
@@ -3732,7 +3742,10 @@ func (g *Generator) allocKWVar(kw string) string {
 
 var (
 	runtimeOwnedVars = map[string]bool{
-		"in-ns": true,
+		// NewEnvironment supplies these roots outside the stdlib loader.
+		"defrecord": true,
+		"in-ns":     true,
+		"record?":   true,
 	}
 
 	wellKnownFunctions = map[uintptr]string{

pkg/runtime/codegen_internal_test.go

@@ -165,6 +165,52 @@ func TestGenerateStaticInstanceCheck(t *testing.T) {
 	}
 }
 
+func TestGenerateStaticInstanceCheckForSameNamespaceDirectLink(t *testing.T) {
+	instanceVar := lang.NSCore.FindInternedVar(lang.NewSymbol("instance?"))
+	if instanceVar == nil {
+		t.Fatal("clojure.core/instance? is not interned")
+	}
+
+	var output bytes.Buffer
+	generator := newGenerator(&output, true)
+	generator.addImport("github.com/glojurelang/glojure/pkg/lang")
+	generator.currentWriter = &output
+	generator.aotNamespace = lang.NSCore
+	target := &aotSpecializationTarget{
+		vr:           instanceVar,
+		directLinked: true,
+		directFnVar:  "aotDirectFn0",
+	}
+	target.directArities[2] = true
+	generator.aotCallTargets[instanceVar] = target
+
+	vectorType := reflect.TypeOf((*lang.IPersistentVector)(nil)).Elem()
+	invoke := &ast.InvokeNode{
+		Fn: &ast.Node{
+			Op:  ast.OpVar,
+			Sub: &ast.VarNode{Var: instanceVar},
+		},
+		Args: []*ast.Node{
+			{Op: ast.OpConst, Sub: &ast.ConstNode{Value: vectorType}},
+			{Op: ast.OpConst, Sub: &ast.ConstNode{Value: nil}},
+		},
+	}
+	generator.generateInvokeDefault(invoke)
+
+	generated := output.String()
+	if !strings.Contains(
+		generated,
+		"lang.IsInstance[lang.IPersistentVector](nil)",
+	) {
+		t.Fatalf("same-namespace instance? did not use a type assertion:\n%s",
+			generated)
+	}
+	if strings.Contains(generated, "aotDirectFn0") {
+		t.Fatalf("same-namespace instance? retained function dispatch:\n%s",
+			generated)
+	}
+}
+
 func TestGenerateDirectCallsForKnownFunctionArities(t *testing.T) {
 	ns := lang.FindOrCreateNamespace(lang.NewSymbol("codegen.direct-known-arities"))
 	ns.ReferAllSnapshot(lang.NSCore, nil)

pkg/runtime/defrecord_test.go

@@ -1,3 +1,5 @@
+//go:build !glj_aot_runtime
+
 package runtime
 
 import (