Merge revision 3813 to 3930 from bleeding_edge to partial snapshots branch.

src/debug.cc

Index: src/debug.cc
===================================================================
--- src/debug.cc	(revision 3935)
+++ src/debug.cc	(working copy)
@@ -31,6 +31,7 @@
 #include "arguments.h"
 #include "bootstrapper.h"
 #include "code-stubs.h"
+#include "codegen.h"
 #include "compilation-cache.h"
 #include "compiler.h"
 #include "debug.h"
@@ -453,15 +454,7 @@
 
 
 bool BreakLocationIterator::IsDebuggerStatement() {
-  if (RelocInfo::IsCodeTarget(rmode())) {
-    Address target = original_rinfo()->target_address();
-    Code* code = Code::GetCodeFromTargetAddress(target);
-    if (code->kind() == Code::STUB) {
-      CodeStub::Major major_key = code->major_key();
-      return (major_key == CodeStub::DebuggerStatement);
-    }
-  }
-  return false;
+  return RelocInfo::DEBUG_BREAK == rmode();
 }
 
 
@@ -696,6 +689,7 @@
                                   0,
                                   NULL,
                                   NULL,
+                                  Handle<String>::null(),
                                   NATIVES_CODE);
   FLAG_allow_natives_syntax = allow_natives_syntax;