Bug 1002041 - Fix non-ion build failures from 716647. r=shu
authorSteve Singer <steve@ssinger.info>
Sun, 27 Apr 2014 17:47:00 -0400
changeset 180912 08c2d710f13d693b0fad5afab3070ffdca78f02e
parent 180911 3a49b88c5bb05b15aabcde775e18aa405c0bf7a1
child 180913 d9a6a378349a840f72466549292c7dbf43b228bf
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
reviewersshu
bugs1002041, 716647
milestone31.0a1
Bug 1002041 - Fix non-ion build failures from 716647. r=shu
js/src/vm/Stack.cpp
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -692,20 +692,22 @@ FrameIter::FrameIter(const FrameIter &ot
 FrameIter::FrameIter(const Data &data)
   : data_(data)
 #ifdef JS_ION
   , ionInlineFrames_(data.cx_, data_.jitFrames_.isIonJS() ? &data_.jitFrames_ : nullptr)
 #endif
 {
     JS_ASSERT(data.cx_);
 
+#ifdef JS_ION
     if (data_.jitFrames_.isIonJS()) {
         while (ionInlineFrames_.frameNo() != data.ionInlineFrameNo_)
             ++ionInlineFrames_;
     }
+#endif
 }
 
 #ifdef JS_ION
 void
 FrameIter::nextJitFrame()
 {
     if (data_.jitFrames_.isIonJS()) {
         ionInlineFrames_.resetOn(&data_.jitFrames_);
@@ -784,26 +786,27 @@ FrameIter::operator++()
 
             data_.contextOption_ = prevContextOption;
             data_.savedOption_ = prevSavedOption;
             data_.cx_ = data_.activations_->cx();
             break;
         }
         popInterpreterFrame();
         break;
+#ifdef JS_ION
       case JIT:
-#ifdef JS_ION
         popJitFrame();
         break;
-#else
-        MOZ_ASSUME_UNREACHABLE("Unexpected state");
-#endif
       case ASMJS:
         popAsmJSFrame();
         break;
+#else
+    default:
+        MOZ_ASSUME_UNREACHABLE("Unexpected state");
+#endif
     }
     return *this;
 }
 
 FrameIter::Data *
 FrameIter::copyData() const
 {
     Data *data = data_.cx_->new_<Data>(data_);