Reviewers: Jakob,

Description:
Rollback of r14496 in trunk branch.

frames.h/cc cleanup

BUG=None
[email protected]

Please review this at https://codereview.chromium.org/14638006/

SVN Base: https://v8.googlecode.com/svn/trunk

Affected files:
  M src/frames.h
  M src/frames.cc
  M src/version.cc


Index: src/frames.cc
diff --git a/src/frames.cc b/src/frames.cc
index a389df4b5570258745facc99619247f5c8ad3f42..aaf8c79e23256a12d4d3a7fe7bce939f9f604ff8 100644
--- a/src/frames.cc
+++ b/src/frames.cc
@@ -168,6 +168,7 @@ void StackFrameIterator::Reset() {
         reinterpret_cast<Address*>(StandardFrame::ComputePCAddress(fp_)));
     type = StackFrame::ComputeType(isolate(), &state);
   }
+  if (SingletonFor(type) == NULL) return;
   frame_ = SingletonFor(type, &state);
 }

Index: src/frames.h
diff --git a/src/frames.h b/src/frames.h
index 30ccf388f8b9032bb0bc1c085cde4be2bc3fd666..678191b950a0172a37f62a78fb9533f977502613 100644
--- a/src/frames.h
+++ b/src/frames.h
@@ -969,11 +969,9 @@ typedef JavaScriptFrameIteratorTemp<SafeStackFrameIterator>

 class SafeStackTraceFrameIterator: public SafeJavaScriptFrameIterator {
  public:
-  SafeStackTraceFrameIterator(Isolate* isolate,
-                              Address fp,
-                              Address sp,
-                              Address low_bound,
-                              Address high_bound);
+  explicit SafeStackTraceFrameIterator(Isolate* isolate,
+                                       Address fp, Address sp,
+ Address low_bound, Address high_bound);
   void Advance();
 };

Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index 91ae97726f54119681da42db1abf7d5373cbce5e..28094f245206a2f66b9569b70d4fdef5c9b74582 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     18
 #define BUILD_NUMBER      5
-#define PATCH_LEVEL       0
+#define PATCH_LEVEL       1
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to