Skip to content

Commit 76b1881

Browse files
committed
[truffle] Stop passing an unneeded argument when declaring variables
1 parent bac32bb commit 76b1881

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/vm/jvm/Truffle.nqp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ class QAST::TruffleCompiler does SerializeOnce {
11231123
elsif $node.decl eq 'var' || $node.decl eq 'static' {
11241124
my int $type := self.type_from_typeobj($node.returns);
11251125
$*BLOCK.register_var_type($node, $type);
1126-
@*DECLARATIONS.push(["declare-{$node.scope}", $type, $node.name, ["null"]]);
1126+
@*DECLARATIONS.push(["declare-{$node.scope}", $type, $node.name]);
11271127
}
11281128
elsif $node.decl eq 'param' {
11291129
$*BLOCK.add_param($node);

src/vm/jvm/runtime/org/perl6/nqp/truffle/ManageScopes.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.perl6.nqp.dsl.Deserializer;
4646
import org.perl6.nqp.truffle.nodes.NQPNode;
4747
import org.perl6.nqp.truffle.nodes.NQPBlockBodyNode;
48+
import org.perl6.nqp.truffle.nodes.expression.NQPNullNode;
4849
import org.perl6.nqp.truffle.nodes.control.NQPBlockNode;
4950
import org.perl6.nqp.truffle.nodes.control.NQPStaticBlockNode;
5051
import org.perl6.nqp.truffle.nodes.control.NQPForcedOuterBlockNode;
@@ -119,8 +120,8 @@ public static NQPScope declareLexical(NQPScope scope, long type, String name) {
119120
}
120121

121122
@Deserializer("declare-lexical")
122-
public static NQPNode createDeclareLexical(NQPScope scope, long type, String name, NQPNode inner) {
123-
return inner;
123+
public static NQPNode createDeclareLexical(NQPScope scope, long type, String name) {
124+
return new NQPNullNode();
124125
}
125126

126127
@Predeserializer("declare-local")
@@ -130,8 +131,8 @@ public static NQPScope declareLocal(NQPScope scope, long type, String name) {
130131
}
131132

132133
@Deserializer("declare-local")
133-
public static NQPNode createDeclareLocal(NQPScope scope, long type, String name, NQPNode inner) {
134-
return inner;
134+
public static NQPNode createDeclareLocal(NQPScope scope, long type, String name) {
135+
return new NQPNullNode();
135136
}
136137

137138
@Predeserializer("comp-unit")

0 commit comments

Comments
 (0)