From fe58bf6b1f389d51fc8b2f3e08b6e140660aebfa Mon Sep 17 00:00:00 2001 From: Andrew Binstock <920630+platypusguy@users.noreply.github.com> Date: Mon, 13 Jan 2025 23:08:59 -0800 Subject: [PATCH] JACOBIN-575 Added breadcrumbs for pushing J functions into the GMT at class instantiation. --- src/config/buildno.go | 2 +- src/jvm/instantiate.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/buildno.go b/src/config/buildno.go index 5fff2a6c..2041b678 100644 --- a/src/config/buildno.go +++ b/src/config/buildno.go @@ -8,4 +8,4 @@ package config -var BuildNo = 3417 \ No newline at end of file +var BuildNo = 3418 \ No newline at end of file diff --git a/src/jvm/instantiate.go b/src/jvm/instantiate.go index f37dcd8b..47420872 100644 --- a/src/jvm/instantiate.go +++ b/src/jvm/instantiate.go @@ -136,7 +136,7 @@ func InstantiateClass(classname string, frameStack *list.List) (any, error) { case 'L', '[': fldValue = object.Null } - statics.AddStatic(staticName, statics.Static{Type: string(fldType[0]), Value: fldValue}) // CURR + statics.AddStatic(staticName, statics.Static{Type: string(fldType[0]), Value: fldValue}) } } } // loop through the fields if any @@ -147,7 +147,7 @@ func InstantiateClass(classname string, frameStack *list.List) (any, error) { // and work our way down to the present class, adding fields to FieldTable. // so we add the present class into position[0] and then loop through // the slice of class names - superclasses = append([]string{classname}, superclasses...) + superclasses = append([]string{classname}, superclasses...) // CURR: JACOBIN-575 we need to add methods to GMT for j := len(superclasses) - 1; j >= 0; j-- { superclassName := superclasses[j] c := classloader.MethAreaFetch(superclassName)