Changeset 194767 in webkit

Timestamp:

Jan 8, 2016, 10:10:36 AM (9 years ago)

Author:

mark.lam@apple.com

Message:

Rename StringFromCharCode to StringFromSingleCharCode.
​https://bugs.webkit.org/show_bug.cgi?id=152897

Reviewed by Daniel Bates.

StringFromSingleCharCode is a better name because the intrinsic it represents
only applies when we are converting from a single char code. This is purely
a refactoring patch. There is no semantic change.

• dfg/DFGAbstractInterpreterInlines.h:

(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::handleIntrinsicCall):

• dfg/DFGClobberize.h:

(JSC::DFG::clobberize):

• dfg/DFGDoesGC.cpp:

(JSC::DFG::doesGC):

• dfg/DFGFixupPhase.cpp:

(JSC::DFG::FixupPhase::fixupNode):

• dfg/DFGNodeType.h:
• dfg/DFGOperations.cpp:
• dfg/DFGOperations.h:
• dfg/DFGPredictionPropagationPhase.cpp:

(JSC::DFG::PredictionPropagationPhase::propagate):

• dfg/DFGSafeToExecute.h:

(JSC::DFG::safeToExecute):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compileFromCharCode):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• runtime/StringConstructor.cpp:

(JSC::stringFromCharCode):
(JSC::stringFromSingleCharCode):

• runtime/StringConstructor.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGAbstractInterpreterInlines.h (modified) (1 diff)
• dfg/DFGByteCodeParser.cpp (modified) (1 diff)
• dfg/DFGClobberize.h (modified) (1 diff)
• dfg/DFGDoesGC.cpp (modified) (1 diff)
• dfg/DFGFixupPhase.cpp (modified) (1 diff)
• dfg/DFGNodeType.h (modified) (1 diff)
• dfg/DFGOperations.cpp (modified) (1 diff)
• dfg/DFGOperations.h (modified) (1 diff)
• dfg/DFGPredictionPropagationPhase.cpp (modified) (1 diff)
• dfg/DFGSafeToExecute.h (modified) (1 diff)
• dfg/DFGSpeculativeJIT.cpp (modified) (1 diff)
• dfg/DFGSpeculativeJIT32_64.cpp (modified) (1 diff)
• dfg/DFGSpeculativeJIT64.cpp (modified) (1 diff)
• runtime/StringConstructor.cpp (modified) (1 diff)
• runtime/StringConstructor.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-01-08  Mark Lam  <mark.lam@apple.com>
+
+        Rename StringFromCharCode to StringFromSingleCharCode.
+        https://bugs.webkit.org/show_bug.cgi?id=152897
+
+        Reviewed by Daniel Bates.
+
+        StringFromSingleCharCode is a better name because the intrinsic it represents
+        only applies when we are converting from a single char code.  This is purely
+        a refactoring patch.  There is no semantic change.
+
+        * dfg/DFGAbstractInterpreterInlines.h:
+        (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+        * dfg/DFGByteCodeParser.cpp:
+        (JSC::DFG::ByteCodeParser::handleIntrinsicCall):
+        * dfg/DFGClobberize.h:
+        (JSC::DFG::clobberize):
+        * dfg/DFGDoesGC.cpp:
+        (JSC::DFG::doesGC):
+        * dfg/DFGFixupPhase.cpp:
+        (JSC::DFG::FixupPhase::fixupNode):
+        * dfg/DFGNodeType.h:
+        * dfg/DFGOperations.cpp:
+        * dfg/DFGOperations.h:
+        * dfg/DFGPredictionPropagationPhase.cpp:
+        (JSC::DFG::PredictionPropagationPhase::propagate):
+        * dfg/DFGSafeToExecute.h:
+        (JSC::DFG::safeToExecute):
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::compileFromCharCode):
+        * dfg/DFGSpeculativeJIT32_64.cpp:
+        (JSC::DFG::SpeculativeJIT::compile):
+        * dfg/DFGSpeculativeJIT64.cpp:
+        (JSC::DFG::SpeculativeJIT::compile):
+        * runtime/StringConstructor.cpp:
+        (JSC::stringFromCharCode):
+        (JSC::stringFromSingleCharCode):
+        * runtime/StringConstructor.h:
+
 2016-01-08  Konstantin Tokarev  <annulen@yandex.ru>
 

trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h

@@ -1342 +1342 @@
         break;
         
-    case StringFromCharCode:
+    case StringFromSingleCharCode:
         forNode(node).setType(m_graph, SpecString);
         break;

trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

@@ -2162 +2162 @@
         insertChecks();
         VirtualRegister indexOperand = virtualRegisterForArgument(1, registerOffset);
-        Node* charCode = addToGraph(StringFromCharCode, get(indexOperand));
+        Node* charCode = addToGraph(StringFromSingleCharCode, get(indexOperand));
 
         set(VirtualRegister(resultOperand), charCode);

trunk/Source/JavaScriptCore/dfg/DFGClobberize.h

@@ -136 +136 @@
     case SkipScope:
     case StringCharCodeAt:
-    case StringFromCharCode:
+    case StringFromSingleCharCode:
     case CompareStrictEq:
     case IsUndefined:

trunk/Source/JavaScriptCore/dfg/DFGDoesGC.cpp

@@ -169 +169 @@
     case ForceOSRExit:
     case CheckWatchdogTimer:
-    case StringFromCharCode:
+    case StringFromSingleCharCode:
     case Unreachable:
     case ExtractOSREntryLocal:

trunk/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp

@@ -605 +605 @@
         }
 
-        case StringFromCharCode:
+        case StringFromSingleCharCode:
             fixEdge<Int32Use>(node->child1());
             break;

trunk/Source/JavaScriptCore/dfg/DFGNodeType.h

@@ -236 +236 @@
     macro(StringCharCodeAt, NodeResultInt32) \
     macro(StringCharAt, NodeResultJS) \
-    macro(StringFromCharCode, NodeResultJS) \
+    macro(StringFromSingleCharCode, NodeResultJS) \
     \
     /* Nodes for comparison operations. */\

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -1307 +1307 @@
 #endif
 
-JSCell* JIT_OPERATION operationStringFromCharCode(ExecState* exec, int32_t op1)
-{
-    VM* vm = &exec->vm();
-    NativeCallFrameTracer tracer(vm, exec);
-    return JSC::stringFromCharCode(exec, op1);
+JSCell* JIT_OPERATION operationStringFromSingleCharCode(ExecState* exec, int32_t op1)
+{
+    VM* vm = &exec->vm();
+    NativeCallFrameTracer tracer(vm, exec);
+    return JSC::stringFromSingleCharCode(exec, op1);
 }
 

trunk/Source/JavaScriptCore/dfg/DFGOperations.h

@@ -38 +38 @@
 extern "C" {
 
-JSCell* JIT_OPERATION operationStringFromCharCode(ExecState*, int32_t)  WTF_INTERNAL; 
+JSCell* JIT_OPERATION operationStringFromSingleCharCode(ExecState*, int32_t)  WTF_INTERNAL;
 
 // These routines are provide callbacks out to C++ implementations of operations too complex to JIT.

trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp

@@ -531 +531 @@
         }
         
-        case StringFromCharCode: {
+        case StringFromSingleCharCode: {
             changed |= setPrediction(SpecString);
             changed |= node->child1()->mergeFlags(NodeBytecodeUsesAsNumber | NodeBytecodeUsesAsInt);            

trunk/Source/JavaScriptCore/dfg/DFGSafeToExecute.h

@@ -284 +284 @@
     case ForceOSRExit:
     case CheckWatchdogTimer:
-    case StringFromCharCode:
+    case StringFromSingleCharCode:
     case NewTypedArray:
     case Unreachable:

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -1886 +1886 @@
 
     slowCases.append(m_jit.branchTest32(MacroAssembler::Zero, scratchReg));
-    addSlowPathGenerator(slowPathCall(slowCases, this, operationStringFromCharCode, scratchReg, propertyReg));
+    addSlowPathGenerator(slowPathCall(slowCases, this, operationStringFromSingleCharCode, scratchReg, propertyReg));
     cellResult(scratchReg, m_currentNode);
 }

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp

@@ -2369 +2369 @@
     }
 
-    case StringFromCharCode: {
+    case StringFromSingleCharCode: {
         compileFromCharCode(node);
         break;

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp

@@ -2491 +2491 @@
     }
 
-    case StringFromCharCode: {
+    case StringFromSingleCharCode: {
         compileFromCharCode(node);
         break;

trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp

@@ -89 +89 @@
 }
 
-JSCell* JSC_HOST_CALL stringFromCharCode(ExecState* exec, int32_t arg)
+JSCell* JSC_HOST_CALL stringFromSingleCharCode(ExecState* exec, int32_t arg)
 {
     return jsSingleCharacterString(exec, arg);

trunk/Source/JavaScriptCore/runtime/StringConstructor.h

@@ -56 +56 @@
 };
 
-JSCell* JSC_HOST_CALL stringFromCharCode(ExecState*, int32_t);
+JSCell* JSC_HOST_CALL stringFromSingleCharCode(ExecState*, int32_t);
 JSCell* stringConstructor(ExecState*, JSValue);