commit 7dfb5beeec8821521beeb2b8eac36707a663064c
author verwaest <verwaest@chromium.org> Thu Apr 21 11:23:38 2016
committer Commit bot <commit-bot@chromium.org> Thu Apr 21 11:24:31 2016
tree 113763782bd7c9dfd0183866ef8387c5ba46e64d
parent b3cf031eb833a9be11061f757a70f7d24a8b9c0c

Fix 'typeof null' canonicalization in crankshaft

BUG=

Review URL: https://codereview.chromium.org/1912553002

Cr-Commit-Position: refs/heads/master@{#35699}

src/crankshaft/hydrogen-instructions.cc

diff --git a/src/crankshaft/hydrogen-instructions.cc b/src/crankshaft/hydrogen-instructions.cc
index 3d48d8f..55e077b 100644
--- a/src/crankshaft/hydrogen-instructions.cc
+++ b/src/crankshaft/hydrogen-instructions.cc
@@ -1203,7 +1203,6 @@
 String* TypeOfString(HConstant* constant, Isolate* isolate) {
   Heap* heap = isolate->heap();
   if (constant->HasNumberValue()) return heap->number_string();
-  if (constant->IsUndetectable()) return heap->undefined_string();
   if (constant->HasStringValue()) return heap->string_string();
   switch (constant->GetInstanceType()) {
     case ODDBALL_TYPE: {
@@ -1232,6 +1231,7 @@
       return nullptr;
     }
     default:
+      if (constant->IsUndetectable()) return heap->undefined_string();
       if (constant->IsCallable()) return heap->function_string();
       return heap->object_string();
   }