🦄 refactor: Revise type cast to exclude trivial

caoccao · Oct 30, 2024 · b183156 · b183156
1 parent 66c888e
commit b183156
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/ast/Ts2JavaAstVarDecl.java b/src/main/java/com/caoccao/javet/buddy/ts2java/ast/Ts2JavaAstVarDecl.java
@@ -70,7 +70,7 @@ public Optional<TypeDescription> manipulate(JavaFunctionContext functionContext,
                         optionalFromType.ifPresent(fromType ->
                                 JavaClassCast.upCast(fromType, toType, functionContext::addStackManipulation));
                         JavaLocalVariable localVariable = new JavaLocalVariable(name, toType);
-                        MethodVariableAccess methodVariableAccess = MethodVariableAccess.of(localVariable.getType());
+                        MethodVariableAccess methodVariableAccess = MethodVariableAccess.of(toType);
                         StackManipulation stackManipulation = methodVariableAccess.storeAt(functionContext.getNextOffset());
                         functionContext.addStackManipulation(stackManipulation);
                         functionContext.addLocalVariable(localVariable);

diff --git a/src/main/java/com/caoccao/javet/buddy/ts2java/compiler/JavaClassCast.java b/src/main/java/com/caoccao/javet/buddy/ts2java/compiler/JavaClassCast.java
@@ -142,19 +142,19 @@ public static TypeDescription getUpCastTypeForMathOp(TypeDescription... types) {
         TypeDescription returnType = types[0];
         for (int i = 1; i < length; i++) {
             TypeDescription type = types[i];
-            if (PrimitiveWideningDelegate.forPrimitive(returnType).widenTo(type).isValid()) {
+            StackManipulation stackManipulation = PrimitiveWideningDelegate.forPrimitive(returnType).widenTo(type);
+            if (stackManipulation.isValid() && stackManipulation != StackManipulation.Trivial.INSTANCE) {
                 returnType = type;
             }
         }
         return returnType;
     }
 
     public static boolean upCast(
-            TypeDescription fromTypeDescription,
-            TypeDescription toTypeDescription,
+            TypeDescription fromType,
+            TypeDescription toType,
             Consumer<StackManipulation> stackManipulationConsumer) {
-        StackManipulation stackManipulation =
-                PrimitiveWideningDelegate.forPrimitive(fromTypeDescription).widenTo(toTypeDescription);
+        StackManipulation stackManipulation = PrimitiveWideningDelegate.forPrimitive(fromType).widenTo(toType);
         if (stackManipulation.isValid() && stackManipulation != StackManipulation.Trivial.INSTANCE) {
             stackManipulationConsumer.accept(stackManipulation);
         }