Some follow-up fixes after r23801.

R=rossberg@chromium.org
TEST=mjsunit --turbo-types

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23812 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/compiler/js-operator.h b/src/compiler/js-operator.h
index f2d039e..cb3c47c 100644 (file)
--- a/src/compiler/js-operator.h
+++ b/src/compiler/js-operator.h
@@ -156,7 +156,7 @@ class JSOperatorBuilder {
   }
   Operator* StoreContext(uint16_t depth, uint32_t index) {
     ContextAccess access(depth, index, false);
-    OP1(JSStoreContext, ContextAccess, access, Operator::kNoProperties, 2, 1);
+    OP1(JSStoreContext, ContextAccess, access, Operator::kNoProperties, 2, 0);
   }
 
   Operator* TypeOf() { SIMPLE(JSTypeOf, Operator::kPure, 1, 1); }

diff --git a/src/compiler/typer.cc b/src/compiler/typer.cc
index 3b56265..da66a82 100644 (file)
--- a/src/compiler/typer.cc
+++ b/src/compiler/typer.cc
@@ -303,14 +303,13 @@ Bounds Typer::Visitor::TypeFinish(Node* node) {
 
 
 Bounds Typer::Visitor::TypeFrameState(Node* node) {
-  UNREACHABLE();
-  return Bounds();
+  // TODO(rossberg): Ideally FrameState wouldn't have a value output.
+  return Bounds(Type::Internal(zone()));
 }
 
 
 Bounds Typer::Visitor::TypeStateValues(Node* node) {
-  UNREACHABLE();
-  return Bounds();
+  return Bounds(Type::Internal(zone()));
 }