author | hannesw |
Wed, 20 Dec 2017 21:40:11 +0100 | |
changeset 48380 | 597f69e5f1e3 |
parent 47216 | 71c04702a3d5 |
permissions | -rw-r--r-- |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
1 |
/* |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
2 |
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
4 |
* |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
10 |
* |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
15 |
* accompanied this code). |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
16 |
* |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
20 |
* |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
23 |
* questions. |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
24 |
*/ |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
25 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
26 |
package jdk.nashorn.internal.codegen; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
27 |
|
20927 | 28 |
import java.util.ArrayList; |
27970
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
29 |
import java.util.HashSet; |
20927 | 30 |
import java.util.List; |
27970
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
31 |
import java.util.Set; |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
32 |
import jdk.nashorn.internal.codegen.types.Type; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
33 |
import jdk.nashorn.internal.ir.BinaryNode; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
34 |
import jdk.nashorn.internal.ir.Block; |
18867
bc91e3fcc5ba
8013925: Remove symbol fields from nodes that don't need them
attila
parents:
17769
diff
changeset
|
35 |
import jdk.nashorn.internal.ir.BlockStatement; |
27970
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
36 |
import jdk.nashorn.internal.ir.CaseNode; |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
37 |
import jdk.nashorn.internal.ir.EmptyNode; |
27970
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
38 |
import jdk.nashorn.internal.ir.Expression; |
16523
af8b30edebce
8009718: Lazy execution architecture continued - ScriptFunctionData is either final or recompilable. Moved ScriptFunctionData creation logic away from runtime to compile time. Prepared for method generation/specialization. Got rid of ScriptFunctionImplTrampoline whose semantics could be done as part of the relinking anyway. Merge with the lookup package change.
lagergren
parents:
16233
diff
changeset
|
39 |
import jdk.nashorn.internal.ir.FunctionNode; |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
40 |
import jdk.nashorn.internal.ir.IfNode; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
41 |
import jdk.nashorn.internal.ir.LiteralNode; |
17766 | 42 |
import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode; |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
43 |
import jdk.nashorn.internal.ir.Node; |
20927 | 44 |
import jdk.nashorn.internal.ir.Statement; |
27970
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
45 |
import jdk.nashorn.internal.ir.SwitchNode; |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
46 |
import jdk.nashorn.internal.ir.TernaryNode; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
47 |
import jdk.nashorn.internal.ir.UnaryNode; |
20927 | 48 |
import jdk.nashorn.internal.ir.VarNode; |
32888
24f99be3d5ab
8134502: introduce abstraction for basic NodeVisitor usage
attila
parents:
32787
diff
changeset
|
49 |
import jdk.nashorn.internal.ir.visitor.SimpleNodeVisitor; |
24745
3a6e1477362b
8041434: Add synchronization to the common global constants structure
lagergren
parents:
24744
diff
changeset
|
50 |
import jdk.nashorn.internal.runtime.Context; |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
51 |
import jdk.nashorn.internal.runtime.JSType; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
52 |
import jdk.nashorn.internal.runtime.ScriptRuntime; |
24744
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
53 |
import jdk.nashorn.internal.runtime.logging.DebugLogger; |
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
54 |
import jdk.nashorn.internal.runtime.logging.Loggable; |
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
55 |
import jdk.nashorn.internal.runtime.logging.Logger; |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
56 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
57 |
/** |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
58 |
* Simple constant folding pass, executed before IR is starting to be lowered. |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
59 |
*/ |
24744
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
60 |
@Logger(name="fold") |
32888
24f99be3d5ab
8134502: introduce abstraction for basic NodeVisitor usage
attila
parents:
32787
diff
changeset
|
61 |
final class FoldConstants extends SimpleNodeVisitor implements Loggable { |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
62 |
|
24744
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
63 |
private final DebugLogger log; |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
64 |
|
24759
31aed7d9c02a
8034206: Make parts of code pipeline reusable in order to facilitate faster warmup and faster lazy compilation.
lagergren
parents:
24745
diff
changeset
|
65 |
FoldConstants(final Compiler compiler) { |
31aed7d9c02a
8034206: Make parts of code pipeline reusable in order to facilitate faster warmup and faster lazy compilation.
lagergren
parents:
24745
diff
changeset
|
66 |
this.log = initLogger(compiler.getContext()); |
24744
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
67 |
} |
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
68 |
|
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
69 |
@Override |
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
70 |
public DebugLogger getLogger() { |
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
71 |
return log; |
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
72 |
} |
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
73 |
|
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
74 |
@Override |
24745
3a6e1477362b
8041434: Add synchronization to the common global constants structure
lagergren
parents:
24744
diff
changeset
|
75 |
public DebugLogger initLogger(final Context context) { |
3a6e1477362b
8041434: Add synchronization to the common global constants structure
lagergren
parents:
24744
diff
changeset
|
76 |
return context.getLogger(this.getClass()); |
16233
95d3e01c04c3
8008199: Lazy compilation and trampoline implementation
lagergren
parents:
16201
diff
changeset
|
77 |
} |
95d3e01c04c3
8008199: Lazy compilation and trampoline implementation
lagergren
parents:
16201
diff
changeset
|
78 |
|
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
79 |
@Override |
16530
201d682e75f4
8010652: Eliminate non-child references in Block/FunctionNode, and make few node types immutable
attila
parents:
16523
diff
changeset
|
80 |
public Node leaveUnaryNode(final UnaryNode unaryNode) { |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
81 |
final LiteralNode<?> literalNode = new UnaryNodeConstantEvaluator(unaryNode).eval(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
82 |
if (literalNode != null) { |
24744
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
83 |
log.info("Unary constant folded ", unaryNode, " to ", literalNode); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
84 |
return literalNode; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
85 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
86 |
return unaryNode; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
87 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
88 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
89 |
@Override |
16530
201d682e75f4
8010652: Eliminate non-child references in Block/FunctionNode, and make few node types immutable
attila
parents:
16523
diff
changeset
|
90 |
public Node leaveBinaryNode(final BinaryNode binaryNode) { |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
91 |
final LiteralNode<?> literalNode = new BinaryNodeConstantEvaluator(binaryNode).eval(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
92 |
if (literalNode != null) { |
24744
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
93 |
log.info("Binary constant folded ", binaryNode, " to ", literalNode); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
94 |
return literalNode; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
95 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
96 |
return binaryNode; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
97 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
98 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
99 |
@Override |
16530
201d682e75f4
8010652: Eliminate non-child references in Block/FunctionNode, and make few node types immutable
attila
parents:
16523
diff
changeset
|
100 |
public Node leaveFunctionNode(final FunctionNode functionNode) { |
32692
8f60bd284bf4
8055917: jdk.nashorn.internal.codegen.CompilationPhase$N should be renamed to proper classes
sundar
parents:
31490
diff
changeset
|
101 |
return functionNode; |
16523
af8b30edebce
8009718: Lazy execution architecture continued - ScriptFunctionData is either final or recompilable. Moved ScriptFunctionData creation logic away from runtime to compile time. Prepared for method generation/specialization. Got rid of ScriptFunctionImplTrampoline whose semantics could be done as part of the relinking anyway. Merge with the lookup package change.
lagergren
parents:
16233
diff
changeset
|
102 |
} |
af8b30edebce
8009718: Lazy execution architecture continued - ScriptFunctionData is either final or recompilable. Moved ScriptFunctionData creation logic away from runtime to compile time. Prepared for method generation/specialization. Got rid of ScriptFunctionImplTrampoline whose semantics could be done as part of the relinking anyway. Merge with the lookup package change.
lagergren
parents:
16233
diff
changeset
|
103 |
|
af8b30edebce
8009718: Lazy execution architecture continued - ScriptFunctionData is either final or recompilable. Moved ScriptFunctionData creation logic away from runtime to compile time. Prepared for method generation/specialization. Got rid of ScriptFunctionImplTrampoline whose semantics could be done as part of the relinking anyway. Merge with the lookup package change.
lagergren
parents:
16233
diff
changeset
|
104 |
@Override |
16530
201d682e75f4
8010652: Eliminate non-child references in Block/FunctionNode, and make few node types immutable
attila
parents:
16523
diff
changeset
|
105 |
public Node leaveIfNode(final IfNode ifNode) { |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
106 |
final Node test = ifNode.getTest(); |
20572
7bceef30eefa
8026042: FoldConstants need to guard against ArrayLiteralNode
hannesw
parents:
18867
diff
changeset
|
107 |
if (test instanceof LiteralNode.PrimitiveLiteralNode) { |
20927 | 108 |
final boolean isTrue = ((LiteralNode.PrimitiveLiteralNode<?>)test).isTrue(); |
109 |
final Block executed = isTrue ? ifNode.getPass() : ifNode.getFail(); |
|
110 |
final Block dropped = isTrue ? ifNode.getFail() : ifNode.getPass(); |
|
111 |
final List<Statement> statements = new ArrayList<>(); |
|
112 |
||
113 |
if (executed != null) { |
|
114 |
statements.addAll(executed.getStatements()); // Get statements form executed branch |
|
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
115 |
} |
20927 | 116 |
if (dropped != null) { |
32787
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
117 |
extractVarNodesFromDeadCode(dropped, statements); // Get var-nodes from non-executed branch |
20927 | 118 |
} |
119 |
if (statements.isEmpty()) { |
|
120 |
return new EmptyNode(ifNode); |
|
121 |
} |
|
122 |
return BlockStatement.createReplacement(ifNode, ifNode.getFinish(), statements); |
|
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
123 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
124 |
return ifNode; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
125 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
126 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
127 |
@Override |
16530
201d682e75f4
8010652: Eliminate non-child references in Block/FunctionNode, and make few node types immutable
attila
parents:
16523
diff
changeset
|
128 |
public Node leaveTernaryNode(final TernaryNode ternaryNode) { |
18867
bc91e3fcc5ba
8013925: Remove symbol fields from nodes that don't need them
attila
parents:
17769
diff
changeset
|
129 |
final Node test = ternaryNode.getTest(); |
20572
7bceef30eefa
8026042: FoldConstants need to guard against ArrayLiteralNode
hannesw
parents:
18867
diff
changeset
|
130 |
if (test instanceof LiteralNode.PrimitiveLiteralNode) { |
27971
bff4872beee5
8066224: fixes for folding a constant-test ternary operator
attila
parents:
27970
diff
changeset
|
131 |
return (((LiteralNode.PrimitiveLiteralNode<?>)test).isTrue() ? ternaryNode.getTrueExpression() : ternaryNode.getFalseExpression()).getExpression(); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
132 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
133 |
return ternaryNode; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
134 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
135 |
|
27970
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
136 |
@Override |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
137 |
public Node leaveSwitchNode(final SwitchNode switchNode) { |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
138 |
return switchNode.setUniqueInteger(lc, isUniqueIntegerSwitchNode(switchNode)); |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
139 |
} |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
140 |
|
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
141 |
private static boolean isUniqueIntegerSwitchNode(final SwitchNode switchNode) { |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
142 |
final Set<Integer> alreadySeen = new HashSet<>(); |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
143 |
for (final CaseNode caseNode : switchNode.getCases()) { |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
144 |
final Expression test = caseNode.getTest(); |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
145 |
if (test != null && !isUniqueIntegerLiteral(test, alreadySeen)) { |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
146 |
return false; |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
147 |
} |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
148 |
} |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
149 |
return true; |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
150 |
} |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
151 |
|
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
152 |
private static boolean isUniqueIntegerLiteral(final Expression expr, final Set<Integer> alreadySeen) { |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
153 |
if (expr instanceof LiteralNode) { |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
154 |
final Object value = ((LiteralNode<?>)expr).getValue(); |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
155 |
if (value instanceof Integer) { |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
156 |
return alreadySeen.add((Integer)value); |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
157 |
} |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
158 |
} |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
159 |
return false; |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
160 |
} |
7b0048b90967
8066225: NPE in MethodEmitter with duplicate integer switch cases
attila
parents:
27212
diff
changeset
|
161 |
|
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
162 |
/** |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
163 |
* Helper class to evaluate constant expressions at compile time This is |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
164 |
* also a simplifier used by BinaryNode visits, UnaryNode visits and |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
165 |
* conversions. |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
166 |
*/ |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
167 |
abstract static class ConstantEvaluator<T extends Node> { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
168 |
protected T parent; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
169 |
protected final long token; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
170 |
protected final int finish; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
171 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
172 |
protected ConstantEvaluator(final T parent) { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
173 |
this.parent = parent; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
174 |
this.token = parent.getToken(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
175 |
this.finish = parent.getFinish(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
176 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
177 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
178 |
/** |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
179 |
* Returns a literal node that replaces the given parent node, or null if replacement |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
180 |
* is impossible |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
181 |
* @return the literal node |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
182 |
*/ |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
183 |
protected abstract LiteralNode<?> eval(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
184 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
185 |
|
32787
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
186 |
/** |
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
187 |
* When we eliminate dead code, we must preserve var declarations as they are scoped to the whole |
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
188 |
* function. This method gathers var nodes from code passed to it, removing their initializers. |
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
189 |
* |
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
190 |
* @param deadCodeRoot the root node of eliminated dead code |
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
191 |
* @param statements a list that will be receiving the var nodes from the dead code, with their |
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
192 |
* initializers removed. |
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
193 |
*/ |
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
194 |
static void extractVarNodesFromDeadCode(final Node deadCodeRoot, final List<Statement> statements) { |
32888
24f99be3d5ab
8134502: introduce abstraction for basic NodeVisitor usage
attila
parents:
32787
diff
changeset
|
195 |
deadCodeRoot.accept(new SimpleNodeVisitor() { |
20927 | 196 |
@Override |
24744
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
197 |
public boolean enterVarNode(final VarNode varNode) { |
20927 | 198 |
statements.add(varNode.setInit(null)); |
199 |
return false; |
|
200 |
} |
|
32787
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
201 |
|
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
202 |
@Override |
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
203 |
public boolean enterFunctionNode(final FunctionNode functionNode) { |
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
204 |
// Don't descend into nested functions |
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
205 |
return false; |
c49a2638ad02
8134488: var statement in if(false) block incorrectly evacuated into enclosing function
attila
parents:
32692
diff
changeset
|
206 |
} |
20927 | 207 |
}); |
208 |
} |
|
209 |
||
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
210 |
private static class UnaryNodeConstantEvaluator extends ConstantEvaluator<UnaryNode> { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
211 |
UnaryNodeConstantEvaluator(final UnaryNode parent) { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
212 |
super(parent); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
213 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
214 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
215 |
@Override |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
216 |
protected LiteralNode<?> eval() { |
24719 | 217 |
final Node rhsNode = parent.getExpression(); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
218 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
219 |
if (!(rhsNode instanceof LiteralNode)) { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
220 |
return null; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
221 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
222 |
|
17766 | 223 |
if (rhsNode instanceof ArrayLiteralNode) { |
224 |
return null; |
|
225 |
} |
|
226 |
||
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
227 |
final LiteralNode<?> rhs = (LiteralNode<?>)rhsNode; |
24775
a0ae9045563f
8044534: Constant folding for unary + should produce int for boolean literals
attila
parents:
24759
diff
changeset
|
228 |
final Type rhsType = rhs.getType(); |
a0ae9045563f
8044534: Constant folding for unary + should produce int for boolean literals
attila
parents:
24759
diff
changeset
|
229 |
final boolean rhsInteger = rhsType.isInteger() || rhsType.isBoolean(); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
230 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
231 |
LiteralNode<?> literalNode; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
232 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
233 |
switch (parent.tokenType()) { |
46169
b385216af0ed
8185252: Unary minus and plus use wrong node Kind
hannesw
parents:
35326
diff
changeset
|
234 |
case POS: |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
235 |
if (rhsInteger) { |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
236 |
literalNode = LiteralNode.newInstance(token, finish, rhs.getInt32()); |
34454
735fec4e8ee8
8144131: ArrayData.getInt implementations do not convert to int32
hannesw
parents:
32888
diff
changeset
|
237 |
} else if (rhsType.isLong()) { |
735fec4e8ee8
8144131: ArrayData.getInt implementations do not convert to int32
hannesw
parents:
32888
diff
changeset
|
238 |
literalNode = LiteralNode.newInstance(token, finish, rhs.getLong()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
239 |
} else { |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
240 |
literalNode = LiteralNode.newInstance(token, finish, rhs.getNumber()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
241 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
242 |
break; |
46169
b385216af0ed
8185252: Unary minus and plus use wrong node Kind
hannesw
parents:
35326
diff
changeset
|
243 |
case NEG: |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
244 |
if (rhsInteger && rhs.getInt32() != 0) { // @see test/script/basic/minuszero.js |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
245 |
literalNode = LiteralNode.newInstance(token, finish, -rhs.getInt32()); |
34454
735fec4e8ee8
8144131: ArrayData.getInt implementations do not convert to int32
hannesw
parents:
32888
diff
changeset
|
246 |
} else if (rhsType.isLong() && rhs.getLong() != 0L) { |
735fec4e8ee8
8144131: ArrayData.getInt implementations do not convert to int32
hannesw
parents:
32888
diff
changeset
|
247 |
literalNode = LiteralNode.newInstance(token, finish, -rhs.getLong()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
248 |
} else { |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
249 |
literalNode = LiteralNode.newInstance(token, finish, -rhs.getNumber()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
250 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
251 |
break; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
252 |
case NOT: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
253 |
literalNode = LiteralNode.newInstance(token, finish, !rhs.getBoolean()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
254 |
break; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
255 |
case BIT_NOT: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
256 |
literalNode = LiteralNode.newInstance(token, finish, ~rhs.getInt32()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
257 |
break; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
258 |
default: |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
259 |
return null; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
260 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
261 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
262 |
return literalNode; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
263 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
264 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
265 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
266 |
//TODO add AND and OR with one constant parameter (bitwise) |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
267 |
private static class BinaryNodeConstantEvaluator extends ConstantEvaluator<BinaryNode> { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
268 |
BinaryNodeConstantEvaluator(final BinaryNode parent) { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
269 |
super(parent); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
270 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
271 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
272 |
@Override |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
273 |
protected LiteralNode<?> eval() { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
274 |
LiteralNode<?> result; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
275 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
276 |
result = reduceTwoLiterals(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
277 |
if (result != null) { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
278 |
return result; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
279 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
280 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
281 |
result = reduceOneLiteral(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
282 |
if (result != null) { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
283 |
return result; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
284 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
285 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
286 |
return null; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
287 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
288 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
289 |
@SuppressWarnings("static-method") |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
290 |
private LiteralNode<?> reduceOneLiteral() { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
291 |
//TODO handle patterns like AND, OR, numeric ops that can be strength reduced but not replaced by a single literal node etc |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
292 |
return null; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
293 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
294 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
295 |
private LiteralNode<?> reduceTwoLiterals() { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
296 |
if (!(parent.lhs() instanceof LiteralNode && parent.rhs() instanceof LiteralNode)) { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
297 |
return null; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
298 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
299 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
300 |
final LiteralNode<?> lhs = (LiteralNode<?>)parent.lhs(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
301 |
final LiteralNode<?> rhs = (LiteralNode<?>)parent.rhs(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
302 |
|
17766 | 303 |
if (lhs instanceof ArrayLiteralNode || rhs instanceof ArrayLiteralNode) { |
304 |
return null; |
|
305 |
} |
|
306 |
||
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
307 |
final Type widest = Type.widest(lhs.getType(), rhs.getType()); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
308 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
309 |
boolean isInteger = widest.isInteger(); |
34732 | 310 |
final double value; |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
311 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
312 |
switch (parent.tokenType()) { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
313 |
case DIV: |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
314 |
value = lhs.getNumber() / rhs.getNumber(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
315 |
break; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
316 |
case ADD: |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
317 |
if ((lhs.isString() || rhs.isNumeric()) && (rhs.isString() || rhs.isNumeric())) { |
24744
5290da85fc3d
8038426: Move all loggers from process wide scope into Global scope
lagergren
parents:
24719
diff
changeset
|
318 |
final Object res = ScriptRuntime.ADD(lhs.getObject(), rhs.getObject()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
319 |
if (res instanceof Number) { |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
320 |
value = ((Number)res).doubleValue(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
321 |
break; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
322 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
323 |
assert res instanceof CharSequence : res + " was not a CharSequence, it was a " + res.getClass(); |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
324 |
return LiteralNode.newInstance(token, finish, res.toString()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
325 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
326 |
return null; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
327 |
case MUL: |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
328 |
value = lhs.getNumber() * rhs.getNumber(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
329 |
break; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
330 |
case MOD: |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
331 |
value = lhs.getNumber() % rhs.getNumber(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
332 |
break; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
333 |
case SUB: |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
334 |
value = lhs.getNumber() - rhs.getNumber(); |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
335 |
break; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
336 |
case SHR: |
34732 | 337 |
final long result = JSType.toUint32(lhs.getInt32() >>> rhs.getInt32()); |
35326
d3ec391b995e
8147845: Varargs Array functions still leaking longs
hannesw
parents:
34732
diff
changeset
|
338 |
return LiteralNode.newInstance(token, finish, JSType.toNarrowestNumber(result)); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
339 |
case SAR: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
340 |
return LiteralNode.newInstance(token, finish, lhs.getInt32() >> rhs.getInt32()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
341 |
case SHL: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
342 |
return LiteralNode.newInstance(token, finish, lhs.getInt32() << rhs.getInt32()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
343 |
case BIT_XOR: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
344 |
return LiteralNode.newInstance(token, finish, lhs.getInt32() ^ rhs.getInt32()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
345 |
case BIT_AND: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
346 |
return LiteralNode.newInstance(token, finish, lhs.getInt32() & rhs.getInt32()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
347 |
case BIT_OR: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
348 |
return LiteralNode.newInstance(token, finish, lhs.getInt32() | rhs.getInt32()); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
349 |
case GE: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
350 |
return LiteralNode.newInstance(token, finish, ScriptRuntime.GE(lhs.getObject(), rhs.getObject())); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
351 |
case LE: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
352 |
return LiteralNode.newInstance(token, finish, ScriptRuntime.LE(lhs.getObject(), rhs.getObject())); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
353 |
case GT: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
354 |
return LiteralNode.newInstance(token, finish, ScriptRuntime.GT(lhs.getObject(), rhs.getObject())); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
355 |
case LT: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
356 |
return LiteralNode.newInstance(token, finish, ScriptRuntime.LT(lhs.getObject(), rhs.getObject())); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
357 |
case NE: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
358 |
return LiteralNode.newInstance(token, finish, ScriptRuntime.NE(lhs.getObject(), rhs.getObject())); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
359 |
case NE_STRICT: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
360 |
return LiteralNode.newInstance(token, finish, ScriptRuntime.NE_STRICT(lhs.getObject(), rhs.getObject())); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
361 |
case EQ: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
362 |
return LiteralNode.newInstance(token, finish, ScriptRuntime.EQ(lhs.getObject(), rhs.getObject())); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
363 |
case EQ_STRICT: |
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
364 |
return LiteralNode.newInstance(token, finish, ScriptRuntime.EQ_STRICT(lhs.getObject(), rhs.getObject())); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
365 |
default: |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
366 |
return null; |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
367 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
368 |
|
31490 | 369 |
isInteger &= JSType.isStrictlyRepresentableAsInt(value); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
370 |
|
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
371 |
if (isInteger) { |
17764
29e6eb3bb9df
8010804: Review long and integer usage conventions
hannesw
parents:
17524
diff
changeset
|
372 |
return LiteralNode.newInstance(token, finish, (int)value); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
373 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
374 |
|
17523
cb4a7c901e0d
8013913: Removed Source field from all nodes except FunctionNode in order to save footprint
lagergren
parents:
17241
diff
changeset
|
375 |
return LiteralNode.newInstance(token, finish, value); |
16201
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
376 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
377 |
} |
889ddb179cdf
8007062: Split Lower up into Lower/Attr/FinalizeTypes. Integrate AccessSpecalizer into FinalizeTypes.
lagergren
parents:
diff
changeset
|
378 |
} |