From 845df2597c4b1cd2cbd29d212e4535083b55f5bf Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Wed, 14 Jan 2015 10:13:28 +0100
Subject: [PATCH] Bug 1120960 - Remove NativeObject::lookup workaround for MSVC
 bug. r=Waldo

---
 js/src/jit/BaselineJIT.cpp | 3 +--
 js/src/vm/NativeObject.cpp | 8 --------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/js/src/jit/BaselineJIT.cpp b/js/src/jit/BaselineJIT.cpp
index d0ed3bc883f..9d1e00026fd 100644
--- a/js/src/jit/BaselineJIT.cpp
+++ b/js/src/jit/BaselineJIT.cpp
@@ -270,9 +270,8 @@ CanEnterBaselineJIT(JSContext *cx, HandleScript script, InterpreterFrame *osrFra
         return Method_Compiled;
 
     // Check script warm-up counter.
-    if (script->incWarmUpCounter() <= js_JitOptions.baselineWarmUpThreshold) {
+    if (script->incWarmUpCounter() <= js_JitOptions.baselineWarmUpThreshold)
         return Method_Skipped;
-    }
 
     if (script->isCallsiteClone()) {
         // Ensure the original function is compiled too, so that bailouts from
diff --git a/js/src/vm/NativeObject.cpp b/js/src/vm/NativeObject.cpp
index 2e44b9bc2ba..83a44840b50 100644
--- a/js/src/vm/NativeObject.cpp
+++ b/js/src/vm/NativeObject.cpp
@@ -270,14 +270,6 @@ js::NativeObject::slotInRange(uint32_t slot, SentinelAllowed sentinel) const
 }
 #endif /* DEBUG */
 
-#if defined(_MSC_VER)
-/*
- * Work around a compiler bug in MSVC9 and above, where inlining this function
- * causes stack pointer offsets to go awry and spp to refer to something higher
- * up the stack.
- */
-MOZ_NEVER_INLINE
-#endif
 Shape *
 js::NativeObject::lookup(ExclusiveContext *cx, jsid id)
 {