Changeset 39961 in webkit for trunk/JavaScriptCore/parser/Nodes.h

Timestamp:

Jan 15, 2009, 10:52:13 PM (16 years ago)

Author:

[email protected]

Message:

2009-01-15 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Add support in ResultType to track that the results of bitops
are always of type int32_t.

• parser/Nodes.cpp: (JSC::ReadModifyResolveNode::emitBytecode): (JSC::ReadModifyDotNode::emitBytecode): (JSC::ReadModifyBracketNode::emitBytecode):
• parser/Nodes.h: (JSC::ExpressionNode::): (JSC::BooleanNode::): (JSC::NumberNode::): (JSC::StringNode::): (JSC::PrePostResolveNode::): (JSC::TypeOfResolveNode::): (JSC::TypeOfValueNode::): (JSC::UnaryPlusNode::): (JSC::NegateNode::): (JSC::BitwiseNotNode::): (JSC::LogicalNotNode::): (JSC::MultNode::): (JSC::DivNode::): (JSC::ModNode::): (JSC::SubNode::): (JSC::LeftShiftNode::): (JSC::RightShiftNode::): (JSC::UnsignedRightShiftNode::): (JSC::LessNode::): (JSC::GreaterNode::): (JSC::LessEqNode::): (JSC::GreaterEqNode::): (JSC::InstanceOfNode::): (JSC::EqualNode::): (JSC::NotEqualNode::): (JSC::StrictEqualNode::): (JSC::NotStrictEqualNode::): (JSC::BitAndNode::): (JSC::BitOrNode::): (JSC::BitXOrNode::): (JSC::LogicalOpNode::):
• parser/ResultType.h: (JSC::ResultType::isInt32): (JSC::ResultType::isNotNumber): (JSC::ResultType::booleanType): (JSC::ResultType::numberType): (JSC::ResultType::numberTypeCanReuse): (JSC::ResultType::numberTypeCanReuseIsInt32): (JSC::ResultType::stringOrNumberTypeCanReuse): (JSC::ResultType::stringType): (JSC::ResultType::unknownType): (JSC::ResultType::forAdd): (JSC::ResultType::forBitOp): (JSC::OperandTypes::OperandTypes):

File:

• trunk/JavaScriptCore/parser/Nodes.h (modified) (31 diffs)

trunk/JavaScriptCore/parser/Nodes.h

@@ -157 +157 @@
     class ExpressionNode : public Node {
     public:
-        ExpressionNode(JSGlobalData* globalData, ResultType resultDesc = ResultType::unknown()) JSC_FAST_CALL
+        ExpressionNode(JSGlobalData* globalData, ResultType resultDesc = ResultType::unknownType()) JSC_FAST_CALL
             : Node(globalData)
             , m_resultDesc(resultDesc)
@@ -217 +217 @@
     public:
         BooleanNode(JSGlobalData* globalData, bool value) JSC_FAST_CALL
-            : ExpressionNode(globalData, ResultType::boolean())
+            : ExpressionNode(globalData, ResultType::booleanType())
             , m_value(value)
         {
@@ -233 +233 @@
     public:
         NumberNode(JSGlobalData* globalData, double v) JSC_FAST_CALL
-            : ExpressionNode(globalData, ResultType::constNumber())
+            : ExpressionNode(globalData, ResultType::numberType())
             , m_double(v)
         {
@@ -252 +252 @@
     public:
         StringNode(JSGlobalData* globalData, const Identifier& v) JSC_FAST_CALL
-            : ExpressionNode(globalData, ResultType::string())
+            : ExpressionNode(globalData, ResultType::stringType())
             , m_value(v)
         {
@@ -774 +774 @@
     public:
         PrePostResolveNode(JSGlobalData* globalData, const Identifier& ident, unsigned divot, unsigned startOffset, unsigned endOffset) JSC_FAST_CALL
-            : ExpressionNode(globalData, ResultType::constNumber()) // could be reusable for pre?
+            : ExpressionNode(globalData, ResultType::numberType()) // could be reusable for pre?
             , ThrowableExpressionData(divot, startOffset, endOffset)
             , m_ident(ident)
@@ -954 +954 @@
     public:
         TypeOfResolveNode(JSGlobalData* globalData, const Identifier& ident) JSC_FAST_CALL
-            : ExpressionNode(globalData, ResultType::string())
+            : ExpressionNode(globalData, ResultType::stringType())
             , m_ident(ident)
         {
@@ -970 +970 @@
     public:
         TypeOfValueNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
-            : ExpressionNode(globalData, ResultType::string())
+            : ExpressionNode(globalData, ResultType::stringType())
             , m_expr(expr)
         {
@@ -1089 +1089 @@
     public:
         UnaryPlusNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
-            : UnaryOpNode(globalData, ResultType::constNumber(), expr)
+            : UnaryOpNode(globalData, ResultType::numberType(), expr)
         {
         }
@@ -1101 +1101 @@
     public:
         NegateNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
-            : UnaryOpNode(globalData, ResultType::reusableNumber(), expr)
+            : UnaryOpNode(globalData, ResultType::numberTypeCanReuse(), expr)
         {
         }
@@ -1111 +1111 @@
     public:
         BitwiseNotNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
-            : UnaryOpNode(globalData, ResultType::reusableNumber(), expr)
+            : UnaryOpNode(globalData, ResultType::forBitOp(), expr)
         {
         }
@@ -1121 +1121 @@
     public:
         LogicalNotNode(JSGlobalData* globalData, ExpressionNode* expr) JSC_FAST_CALL
-            : UnaryOpNode(globalData, ResultType::boolean(), expr)
+            : UnaryOpNode(globalData, ResultType::booleanType(), expr)
         {
         }
@@ -1176 +1176 @@
     public:
         MultNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::numberTypeCanReuse(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1186 +1186 @@
     public:
         DivNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::numberTypeCanReuse(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1196 +1196 @@
     public:
         ModNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::numberTypeCanReuse(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1216 +1216 @@
     public:
         SubNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::numberTypeCanReuse(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1226 +1226 @@
     public:
         LeftShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::forBitOp(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1236 +1236 @@
     public:
         RightShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::forBitOp(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1246 +1246 @@
     public:
         UnsignedRightShiftNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::numberTypeCanReuse(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1256 +1256 @@
     public:
         LessNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::booleanType(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1266 +1266 @@
     public:
         GreaterNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : ReverseBinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
+            : ReverseBinaryOpNode(globalData, ResultType::booleanType(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1276 +1276 @@
     public:
         LessEqNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::booleanType(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1286 +1286 @@
     public:
         GreaterEqNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : ReverseBinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
+            : ReverseBinaryOpNode(globalData, ResultType::booleanType(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1309 +1309 @@
     public:
         InstanceOfNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : ThrowableBinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
+            : ThrowableBinaryOpNode(globalData, ResultType::booleanType(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1331 +1331 @@
     public:
         EqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::booleanType(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1342 +1342 @@
     public:
         NotEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::booleanType(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1352 +1352 @@
     public:
         StrictEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::booleanType(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1363 +1363 @@
     public:
         NotStrictEqualNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::boolean(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::booleanType(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1373 +1373 @@
     public:
         BitAndNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::forBitOp(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1383 +1383 @@
     public:
         BitOrNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::forBitOp(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1393 +1393 @@
     public:
         BitXOrNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, bool rightHasAssignments) JSC_FAST_CALL
-            : BinaryOpNode(globalData, ResultType::reusableNumber(), expr1, expr2, rightHasAssignments)
+            : BinaryOpNode(globalData, ResultType::forBitOp(), expr1, expr2, rightHasAssignments)
         {
         }
@@ -1406 +1406 @@
     public:
         LogicalOpNode(JSGlobalData* globalData, ExpressionNode* expr1, ExpressionNode* expr2, LogicalOperator oper) JSC_FAST_CALL
-            : ExpressionNode(globalData, ResultType::boolean())
+            : ExpressionNode(globalData, ResultType::booleanType())
             , m_expr1(expr1)
             , m_expr2(expr2)