Revert of [wasm] Refactor function name table and lookup

Revert of [wasm] Refactor function name table and lookup (patchset #2 id:20001 of https://codereview.chromium.org/2057523002/ )

Reason for revert:
[Sheriff] Speculative revert for flaky gc stress crashes, e.g.:
https://build.chromium.org/p/client.v8/builders/V8%20Mac%20GC%20Stress/builds/6592
https://build.chromium.org/p/client.v8/builders/V8%20Linux64%20GC%20Stress%20-%20custom%20snapshot/builds/6143

Original issue's description:
> [wasm] Refactor function name table and lookup
>
> The function name table will now always be set; a CHECK will fail if
> the length would exceed the integer range.
> Also, the resolution of undefined function names to "<WASM UNNAMED>" is
> moved over to the wasm side.
>
> R=titzer@chromium.org
>
> Committed: https://crrev.com/3400ee9f4f21a455b7850ec42a4182a3c0eba310
> Cr-Commit-Position: refs/heads/master@{#36918}

TBR=titzer@chromium.org,clemensh@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Committed: https://crrev.com/51f14c56c68ca911bc82b6494191c3ae39f130dc
Cr-Commit-Position: refs/heads/master@{#36925}

[Michael Achenbach, 2016-06-13 11:34:49]

The CQ bit was checked by machenbach@chromium.org

[Michael Achenbach, 2016-06-13 11:34:50]

Created Revert of [wasm] Refactor function name table and lookup

[commit-bot: I haz the power, 2016-06-13 11:34:59]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2062793002/1

[commit-bot: I haz the power, 2016-06-13 11:35:11]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-13 11:35:12]

Failed to apply patch for src/wasm/wasm-module.cc:
While running git apply --index -3 -p1;
  error: patch failed: src/wasm/wasm-module.cc:982
  Falling back to three-way merge...
  Applied patch to 'src/wasm/wasm-module.cc' with conflicts.
  U src/wasm/wasm-module.cc

Patch:       src/wasm/wasm-module.cc
Index: src/wasm/wasm-module.cc
diff --git a/src/wasm/wasm-module.cc b/src/wasm/wasm-module.cc
index
8ad95c8c1efd04cff6b9c0606be83bd0d2e63582..07d2ef1113f725ea24bffd1efd64dbd4afa15999
100644
--- a/src/wasm/wasm-module.cc
+++ b/src/wasm/wasm-module.cc
@@ -837,9 +837,10 @@
   // Attach an array with function names and an array with offsets into that
   // first array.
   //-------------------------------------------------------------------------
-  instance.js_object->SetInternalField(
-      kWasmFunctionNamesArray,
-      *BuildFunctionNamesTable(isolate, module_env.module));
+  {
+    Handle<Object> arr = BuildFunctionNamesTable(isolate, module_env.module);
+    instance.js_object->SetInternalField(kWasmFunctionNamesArray, *arr);
+  }
 
   code_stats.Report();
 
@@ -982,30 +983,14 @@
   return -1;
 }
 
-Handle<Object> GetWasmFunctionNameOrNull(Isolate* isolate, Handle<Object> wasm,
-                                         uint32_t func_index) {
-  if (!wasm->IsUndefined()) {
-    Handle<ByteArray> func_names_arr_obj(
-        ByteArray::cast(Handle<JSObject>::cast(wasm)->GetInternalField(
-            kWasmFunctionNamesArray)),
-        isolate);
-    // TODO(clemens): Extract this from the module bytes; skip whole function
-    // name table.
-    Handle<Object> name;
-    if (GetWasmFunctionNameFromTable(func_names_arr_obj, func_index)
-            .ToHandle(&name)) {
-      return name;
-    }
-  }
-  return isolate->factory()->null_value();
-}
-
-Handle<String> GetWasmFunctionName(Isolate* isolate, Handle<Object> wasm,
-                                   uint32_t func_index) {
-  Handle<Object> name_or_null =
-      GetWasmFunctionNameOrNull(isolate, wasm, func_index);
-  if (!name_or_null->IsNull()) return Handle<String>::cast(name_or_null);
-  return isolate->factory()->NewStringFromStaticChars("<WASM UNNAMED>");
+MaybeHandle<String> GetWasmFunctionName(Handle<JSObject> wasm,
+                                        uint32_t func_index) {
+  DCHECK(IsWasmObject(wasm));
+  Object* func_names_arr_obj = wasm->GetInternalField(kWasmFunctionNamesArray);
+  Isolate* isolate = wasm->GetIsolate();
+  if (func_names_arr_obj->IsUndefined(isolate)) return Handle<String>::null();
+  return GetWasmFunctionNameFromTable(
+      handle(ByteArray::cast(func_names_arr_obj), isolate), func_index);
 }
 
 bool IsWasmObject(Handle<JSObject> object) {
@@ -1013,7 +998,9 @@
   return object->GetInternalFieldCount() == kWasmModuleInternalFieldCount &&
          object->GetInternalField(kWasmModuleCodeTable)->IsFixedArray() &&
          object->GetInternalField(kWasmMemArrayBuffer)->IsJSArrayBuffer() &&
-         object->GetInternalField(kWasmFunctionNamesArray)->IsByteArray();
+         (object->GetInternalField(kWasmFunctionNamesArray)->IsByteArray() ||
+          object->GetInternalField(kWasmFunctionNamesArray)
+              ->IsUndefined(object->GetIsolate()));
 }
 
 }  // namespace wasm

[Michael Achenbach, 2016-06-13 11:42:02]

The CQ bit was checked by machenbach@chromium.org

[commit-bot: I haz the power, 2016-06-13 11:42:11]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2062793002/1

[commit-bot: I haz the power, 2016-06-13 11:43:33]

Description was changed from

==========
Revert of [wasm] Refactor function name table and lookup (patchset #2 id:20001
of https://codereview.chromium.org/2057523002/ )

Reason for revert:
[Sheriff] Speculative revert for flaky gc stress crashes, e.g.:
https://build.chromium.org/p/client.v8/builders/V8%20Mac%20GC%20Stress/builds...
https://build.chromium.org/p/client.v8/builders/V8%20Linux64%20GC%20Stress%20...

Original issue's description:
> [wasm] Refactor function name table and lookup
> 
> The function name table will now always be set; a CHECK will fail if
> the length would exceed the integer range.
> Also, the resolution of undefined function names to "<WASM UNNAMED>" is
> moved over to the wasm side.
> 
> R=titzer@chromium.org
> 
> Committed: https://crrev.com/3400ee9f4f21a455b7850ec42a4182a3c0eba310
> Cr-Commit-Position: refs/heads/master@{#36918}

TBR=titzer@chromium.org,clemensh@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
==========

to

==========
Revert of [wasm] Refactor function name table and lookup (patchset #2 id:20001
of https://codereview.chromium.org/2057523002/ )

Reason for revert:
[Sheriff] Speculative revert for flaky gc stress crashes, e.g.:
https://build.chromium.org/p/client.v8/builders/V8%20Mac%20GC%20Stress/builds...
https://build.chromium.org/p/client.v8/builders/V8%20Linux64%20GC%20Stress%20...

Original issue's description:
> [wasm] Refactor function name table and lookup
> 
> The function name table will now always be set; a CHECK will fail if
> the length would exceed the integer range.
> Also, the resolution of undefined function names to "<WASM UNNAMED>" is
> moved over to the wasm side.
> 
> R=titzer@chromium.org
> 
> Committed: https://crrev.com/3400ee9f4f21a455b7850ec42a4182a3c0eba310
> Cr-Commit-Position: refs/heads/master@{#36918}

TBR=titzer@chromium.org,clemensh@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
==========

[commit-bot: I haz the power, 2016-06-13 11:43:34]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-06-13 11:46:40]

Description was changed from

==========
Revert of [wasm] Refactor function name table and lookup (patchset #2 id:20001
of https://codereview.chromium.org/2057523002/ )

Reason for revert:
[Sheriff] Speculative revert for flaky gc stress crashes, e.g.:
https://build.chromium.org/p/client.v8/builders/V8%20Mac%20GC%20Stress/builds...
https://build.chromium.org/p/client.v8/builders/V8%20Linux64%20GC%20Stress%20...

Original issue's description:
> [wasm] Refactor function name table and lookup
> 
> The function name table will now always be set; a CHECK will fail if
> the length would exceed the integer range.
> Also, the resolution of undefined function names to "<WASM UNNAMED>" is
> moved over to the wasm side.
> 
> R=titzer@chromium.org
> 
> Committed: https://crrev.com/3400ee9f4f21a455b7850ec42a4182a3c0eba310
> Cr-Commit-Position: refs/heads/master@{#36918}

TBR=titzer@chromium.org,clemensh@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
==========

to

==========
Revert of [wasm] Refactor function name table and lookup (patchset #2 id:20001
of https://codereview.chromium.org/2057523002/ )

Reason for revert:
[Sheriff] Speculative revert for flaky gc stress crashes, e.g.:
https://build.chromium.org/p/client.v8/builders/V8%20Mac%20GC%20Stress/builds...
https://build.chromium.org/p/client.v8/builders/V8%20Linux64%20GC%20Stress%20...

Original issue's description:
> [wasm] Refactor function name table and lookup
>
> The function name table will now always be set; a CHECK will fail if
> the length would exceed the integer range.
> Also, the resolution of undefined function names to "<WASM UNNAMED>" is
> moved over to the wasm side.
>
> R=titzer@chromium.org
>
> Committed: https://crrev.com/3400ee9f4f21a455b7850ec42a4182a3c0eba310
> Cr-Commit-Position: refs/heads/master@{#36918}

TBR=titzer@chromium.org,clemensh@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Committed: https://crrev.com/51f14c56c68ca911bc82b6494191c3ae39f130dc
Cr-Commit-Position: refs/heads/master@{#36925}
==========

[commit-bot: I haz the power, 2016-06-13 11:46:41]

Patchset 1 (id:??) landed as
https://crrev.com/51f14c56c68ca911bc82b6494191c3ae39f130dc
Cr-Commit-Position: refs/heads/master@{#36925}