Rolling out: Rename StringFromCharCode to StringFromSingleCharCode.
authormark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Jan 2016 18:44:36 +0000 (18:44 +0000)
committermark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 8 Jan 2016 18:44:36 +0000 (18:44 +0000)
https://bugs.webkit.org/show_bug.cgi?id=152897

Not reviewed.

* 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): Deleted.
* runtime/StringConstructor.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194770 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h
Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
Source/JavaScriptCore/dfg/DFGClobberize.h
Source/JavaScriptCore/dfg/DFGDoesGC.cpp
Source/JavaScriptCore/dfg/DFGFixupPhase.cpp
Source/JavaScriptCore/dfg/DFGNodeType.h
Source/JavaScriptCore/dfg/DFGOperations.cpp
Source/JavaScriptCore/dfg/DFGOperations.h
Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp
Source/JavaScriptCore/dfg/DFGSafeToExecute.h
Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp
Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
Source/JavaScriptCore/runtime/StringConstructor.cpp
Source/JavaScriptCore/runtime/StringConstructor.h

index 5177d30..a753cc4 100644 (file)
@@ -1,3 +1,38 @@
+2016-01-08  Mark Lam  <mark.lam@apple.com>
+
+        Rolling out: Rename StringFromCharCode to StringFromSingleCharCode.
+        https://bugs.webkit.org/show_bug.cgi?id=152897
+
+        Not reviewed.
+
+        * 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): Deleted.
+        * runtime/StringConstructor.h:
+
 2016-01-08  Per Arne Vollan  <peavo@outlook.com>
 
         [JSC] Use std::call_once instead of pthread_once when initializing LLVM.
index 1ae4939..34ef630 100644 (file)
@@ -1341,7 +1341,7 @@ bool AbstractInterpreter<AbstractStateType>::executeEffects(unsigned clobberLimi
         forNode(node).setType(SpecInt32);
         break;
         
-    case StringFromSingleCharCode:
+    case StringFromCharCode:
         forNode(node).setType(m_graph, SpecString);
         break;
 
index 84a2af8..a22f6cc 100644 (file)
@@ -2161,7 +2161,7 @@ bool ByteCodeParser::handleIntrinsicCall(int resultOperand, Intrinsic intrinsic,
 
         insertChecks();
         VirtualRegister indexOperand = virtualRegisterForArgument(1, registerOffset);
-        Node* charCode = addToGraph(StringFromSingleCharCode, get(indexOperand));
+        Node* charCode = addToGraph(StringFromCharCode, get(indexOperand));
 
         set(VirtualRegister(resultOperand), charCode);
 
index fbe7d49..72b24c7 100644 (file)
@@ -135,7 +135,7 @@ void clobberize(Graph& graph, Node* node, const ReadFunctor& read, const WriteFu
     case GetScope:
     case SkipScope:
     case StringCharCodeAt:
-    case StringFromSingleCharCode:
+    case StringFromCharCode:
     case CompareStrictEq:
     case IsUndefined:
     case IsBoolean:
index 4bf7a31..702da5b 100644 (file)
@@ -168,7 +168,7 @@ bool doesGC(Graph& graph, Node* node)
     case CountExecution:
     case ForceOSRExit:
     case CheckWatchdogTimer:
-    case StringFromSingleCharCode:
+    case StringFromCharCode:
     case Unreachable:
     case ExtractOSREntryLocal:
     case CheckTierUpInLoop:
index 1f4dd37..a9e0b21 100644 (file)
@@ -604,7 +604,7 @@ private:
             break;
         }
 
-        case StringFromSingleCharCode:
+        case StringFromCharCode:
             fixEdge<Int32Use>(node->child1());
             break;
 
index bb5c949..abcef65 100644 (file)
@@ -235,7 +235,7 @@ namespace JSC { namespace DFG {
     /* Optimizations for string access */ \
     macro(StringCharCodeAt, NodeResultInt32) \
     macro(StringCharAt, NodeResultJS) \
-    macro(StringFromSingleCharCode, NodeResultJS) \
+    macro(StringFromCharCode, NodeResultJS) \
     \
     /* Nodes for comparison operations. */\
     macro(CompareLess, NodeResultBoolean | NodeMustGenerate) \
index 01e01b1..a6d60ad 100644 (file)
@@ -1306,11 +1306,11 @@ double JIT_OPERATION operationRandom(JSGlobalObject* globalObject)
 }
 #endif
 
-JSCell* JIT_OPERATION operationStringFromSingleCharCode(ExecState* exec, int32_t op1)
+JSCell* JIT_OPERATION operationStringFromCharCode(ExecState* exec, int32_t op1)
 {
     VM* vm = &exec->vm();
     NativeCallFrameTracer tracer(vm, exec);
-    return JSC::stringFromSingleCharCode(exec, op1);
+    return JSC::stringFromCharCode(exec, op1);
 }
 
 int64_t JIT_OPERATION operationConvertBoxedDoubleToInt52(EncodedJSValue encodedValue)
index 76c182a..5a48065 100644 (file)
@@ -37,7 +37,7 @@ struct OSRExitBase;
 
 extern "C" {
 
-JSCell* JIT_OPERATION operationStringFromSingleCharCode(ExecState*, int32_t)  WTF_INTERNAL;
+JSCell* JIT_OPERATION operationStringFromCharCode(ExecState*, int32_t)  WTF_INTERNAL; 
 
 // These routines are provide callbacks out to C++ implementations of operations too complex to JIT.
 JSCell* JIT_OPERATION operationCreateThis(ExecState*, JSObject* constructor, int32_t inlineCapacity) WTF_INTERNAL;
index 5513ed1..a670c72 100644 (file)
@@ -530,7 +530,7 @@ private:
             break;
         }
         
-        case StringFromSingleCharCode: {
+        case StringFromCharCode: {
             changed |= setPrediction(SpecString);
             changed |= node->child1()->mergeFlags(NodeBytecodeUsesAsNumber | NodeBytecodeUsesAsInt);            
             break;
index ce825a3..230efed 100644 (file)
@@ -283,7 +283,7 @@ bool safeToExecute(AbstractStateType& state, Graph& graph, Node* node)
     case CountExecution:
     case ForceOSRExit:
     case CheckWatchdogTimer:
-    case StringFromSingleCharCode:
+    case StringFromCharCode:
     case NewTypedArray:
     case Unreachable:
     case ExtractOSREntryLocal:
index 042362f..4cf4fd4 100755 (executable)
@@ -1885,7 +1885,7 @@ void SpeculativeJIT::compileFromCharCode(Node* node)
     m_jit.loadPtr(MacroAssembler::BaseIndex(smallStringsReg, propertyReg, MacroAssembler::ScalePtr, 0), scratchReg);
 
     slowCases.append(m_jit.branchTest32(MacroAssembler::Zero, scratchReg));
-    addSlowPathGenerator(slowPathCall(slowCases, this, operationStringFromSingleCharCode, scratchReg, propertyReg));
+    addSlowPathGenerator(slowPathCall(slowCases, this, operationStringFromCharCode, scratchReg, propertyReg));
     cellResult(scratchReg, m_currentNode);
 }
 
index a823ec3..547aa0b 100644 (file)
@@ -2368,7 +2368,7 @@ void SpeculativeJIT::compile(Node* node)
         break;
     }
 
-    case StringFromSingleCharCode: {
+    case StringFromCharCode: {
         compileFromCharCode(node);
         break;
     }
index c170ce6..a56a52b 100644 (file)
@@ -2490,7 +2490,7 @@ void SpeculativeJIT::compile(Node* node)
         break;
     }
 
-    case StringFromSingleCharCode: {
+    case StringFromCharCode: {
         compileFromCharCode(node);
         break;
     }
index 4bbb0ac..2acf073 100644 (file)
@@ -88,7 +88,7 @@ static EncodedJSValue JSC_HOST_CALL stringFromCharCode(ExecState* exec)
     return JSValue::encode(stringFromCharCodeSlowCase(exec));
 }
 
-JSCell* JSC_HOST_CALL stringFromSingleCharCode(ExecState* exec, int32_t arg)
+JSCell* JSC_HOST_CALL stringFromCharCode(ExecState* exec, int32_t arg)
 {
     return jsSingleCharacterString(exec, arg);
 }
index 7a133ab..357511a 100644 (file)
@@ -55,7 +55,7 @@ private:
     static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
 };
 
-JSCell* JSC_HOST_CALL stringFromSingleCharCode(ExecState*, int32_t);
+JSCell* JSC_HOST_CALL stringFromCharCode(ExecState*, int32_t);
 JSCell* stringConstructor(ExecState*, JSValue);
 
 } // namespace JSC