Changeset 212620 in webkit

Timestamp:

Feb 19, 2017, 7:59:19 PM (8 years ago)

Author:

mark.lam@apple.com

Message:

functionTestWasmModuleFunctions() should use a MarkedArgumentBuffer for storing args instead of a Vector.
​https://bugs.webkit.org/show_bug.cgi?id=168574

Reviewed by Filip Pizlo.

• jsc.cpp:

(callWasmFunction):
(functionTestWasmModuleFunctions):

• runtime/ArgList.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (3 diffs)
• runtime/ArgList.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-02-19  Mark Lam  <mark.lam@apple.com>
+
+        functionTestWasmModuleFunctions() should use a MarkedArgumentBuffer for storing args instead of a Vector.
+        https://bugs.webkit.org/show_bug.cgi?id=168574
+
+        Reviewed by Filip Pizlo.
+
+        * jsc.cpp:
+        (callWasmFunction):
+        (functionTestWasmModuleFunctions):
+        * runtime/ArgList.h:
+
 2017-02-19  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -3070 +3070 @@
 }
 
-static JSValue callWasmFunction(VM* vm, JSGlobalObject* globalObject, JSWebAssemblyCallee* wasmCallee, Vector<JSValue>& boxedArgs)
+// FIXME: https://bugs.webkit.org/show_bug.cgi?id=168582.
+static JSValue callWasmFunction(VM* vm, JSGlobalObject* globalObject, JSWebAssemblyCallee* wasmCallee, const ArgList& boxedArgs)
 {
     JSValue firstArgument;
@@ -3136 +3137 @@
             JSArray* arguments = jsCast<JSArray*>(test->getIndexQuickly(1));
 
-            Vector<JSValue> boxedArgs;
+            MarkedArgumentBuffer boxedArgs;
             for (unsigned argIndex = 0; argIndex < arguments->length(); ++argIndex)
                 boxedArgs.append(box(exec, vm, arguments->getIndexQuickly(argIndex)));
@@ -3151 +3152 @@
                 CommaPrinter comma(", ");
                 for (unsigned argIndex = 0; argIndex < arguments->length(); ++argIndex)
-                    dataLog(comma, valueWithTypeOfWasmValue(exec, vm, boxedArgs[argIndex], arguments->getIndexQuickly(argIndex)));
+                    dataLog(comma, valueWithTypeOfWasmValue(exec, vm, boxedArgs.at(argIndex), arguments->getIndexQuickly(argIndex)));
                 dataLogLn();
 

trunk/Source/JavaScriptCore/runtime/ArgList.h

@@ -165 +165 @@
     JS_EXPORT_PRIVATE void getSlice(int startIndex, ArgList& result) const;
 
-private:
+    // FIXME: This is only made public as a work around for jsc's test helper function,
+    // callWasmFunction() to use. Make this a private method again once we can remove
+    // callWasmFunction().
+    // https://bugs.webkit.org/show_bug.cgi?id=168582
     JSValue* data() const { return m_args; }
 
+private:
     JSValue* m_args;
     int m_argCount;