Merged bleeding_edge -r 685:746 into regexp2000.

src/jsregexp.cc

Index: src/jsregexp.cc
===================================================================
--- src/jsregexp.cc	(revision 746)
+++ src/jsregexp.cc	(working copy)
@@ -140,6 +140,7 @@
   StringShape shape(*pattern);
   if (!pattern->IsFlat(shape)) {
     FlattenString(pattern);
+    shape = StringShape(*pattern);
   }
   Handle<String> flat_string(shape.IsCons() ?
     String::cast(ConsString::cast(*pattern)->first()) :
@@ -425,7 +426,8 @@
         (error_message == NULL) ? "Unknown regexp error" : error_message)));
     Handle<Object> regexp_err =
         Factory::NewSyntaxError("malformed_regexp", array);
-    return Handle<Object>(Top::Throw(*regexp_err));
+    Top::Throw(*regexp_err);
+    return Handle<Object>();
   }
 
   // Convert the return address to a ByteArray pointer.