edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/IronPython/IronPython/Runtime/PythonContext.cs;C870956
File: PythonContext.cs
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/IronPython/IronPython/Runtime/PythonContext.cs;C870956  (server)    5/21/2009 11:29 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/IronPython/IronPython/Runtime/PythonContext.cs;NoAdaptive
@@ -591,7 +591,7 @@
         internal bool ShouldInterpret(PythonCompilerOptions options, SourceUnit source) {
             // We have to turn off adaptive compilation in debug mode to
             // support mangaged debuggers. Also turn off in optimized mode.
-            bool adaptiveCompilation = _options.AdaptiveCompilation && !source.EmitDebugSymbols;
+            bool adaptiveCompilation = !_options.NoAdaptiveCompilation && !source.EmitDebugSymbols;
 
             return options.Interpreted || adaptiveCompilation;
         }
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/IronRuby.Tests/RubyTests.cs;C893105
File: RubyTests.cs
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/IronRuby.Tests/RubyTests.cs;C893105  (server)    5/21/2009 11:10 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/IronRuby.Tests/RubyTests.cs;NoAdaptive
@@ -320,7 +320,6 @@
                 RubyHosting1D,
                 RubyHosting2,
                 RubyHosting3,
-                RubyHosting4,
                 CrossRuntime1,
                 CrossRuntime2,
 
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/IronRuby.Tests/Runtime/ExceptionTests.cs;C840659
File: ExceptionTests.cs
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/IronRuby.Tests/Runtime/ExceptionTests.cs;C840659  (server)    5/21/2009 11:09 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/IronRuby.Tests/Runtime/ExceptionTests.cs;NoAdaptive
@@ -156,11 +156,6 @@
         }
 
         public void Scenario_RubyExceptions7() {
-            // TODO: fix stack traces in interpreter
-            if (Engine.Setup.InterpretedMode) {
-                return;
-            }
-
             AssertOutput(delegate() {
                 CompilerTest(@"
 def foo
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/IronRuby.Tests/Runtime/HostingTests.cs;C846693
File: HostingTests.cs
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/IronRuby.Tests/Runtime/HostingTests.cs;C846693  (server)    5/21/2009 11:10 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/IronRuby.Tests/Runtime/HostingTests.cs;NoAdaptive
@@ -190,20 +190,6 @@
             Assert(module is RubyModule && ((RubyModule)module).Name == "Fcntl");
         }
 
-        public void RubyHosting4() {
-            // TODO: LanguageSetup should have an indexer:
-            //var ruby = Ruby.CreateEngine((setup) => {
-            //    setup["InterpretedMode"] = true;
-            //    setup["SearchPaths"] = "blah";
-            //});
-
-            var ruby = Ruby.CreateEngine((setup) => {
-                setup.InterpretedMode = true;
-            });
-
-            Assert(ruby.Setup.InterpretedMode == true);
-        }
-
         public void Scenario_RubyEngine1() {
             ScriptScope scope = Runtime.CreateScope();
             object x = Engine.CreateScriptSourceFromString("1 + 1").Execute(scope);
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Loader.cs;C846693
File: Loader.cs
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Loader.cs;C846693  (server)    5/21/2009 11:19 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Loader.cs;NoAdaptive
@@ -472,11 +472,11 @@
 
                 AddCompiledFile(fullPath, compiledCode);
 
-                CompileAndRun(globalScope, compiledCode, _context.RubyOptions.InterpretedMode);
+                CompileAndRun(globalScope, compiledCode);
             }
         }
 
-        internal object CompileAndRun(Scope globalScope, ScriptCode/*!*/ code, bool tryEvaluate) {
+        internal object CompileAndRun(Scope globalScope, ScriptCode/*!*/ code) {
             return globalScope != null ? code.Run(globalScope) : code.Run();
         }
 
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/RubyContext.cs;C889829
File: RubyContext.cs
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/RubyContext.cs;C889829  (server)    5/21/2009 11:16 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/RubyContext.cs;NoAdaptive
@@ -1671,7 +1671,7 @@
 #if DEBUG
             if (RubyOptions.LoadFromDisk) {
                 string code;
-                Utils.Log(String.Format("{0} {1}", RubyOptions.InterpretedMode ? "interpreting" : "compiling", sourceUnit.Path ??
+                Utils.Log(String.Format("compiling {0}", sourceUnit.Path ??
                     ((code = sourceUnit.GetCode()).Length < 100 ? code : code.Substring(0, 100))
                     .Replace('\r', ' ').Replace('\n', ' ')
                 ), "COMPILER");
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/RubyScriptCode.cs;C854490
File: RubyScriptCode.cs
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/RubyScriptCode.cs;C854490  (server)    5/21/2009 11:36 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/RubyScriptCode.cs;NoAdaptive
@@ -68,7 +68,7 @@
         private ScriptCodeFunc/*!*/ Target {
             get {
                 if (_target == null) {
-                    var compiledMethod = CompileLambda(_code, SourceUnit.LanguageContext.DomainManager.Configuration.DebugMode);
+                    var compiledMethod = CompileLambda(_code, SourceUnit.LanguageContext);
                     Interlocked.CompareExchange(ref _target, compiledMethod, null);
                 }
                 return _target;
@@ -113,7 +113,11 @@
 
         private static bool _HasPdbPermissions = true;
 
-        internal static T/*!*/ CompileLambda<T>(Expression<T>/*!*/ lambda, bool debugMode) {
+        internal static T/*!*/ CompileLambda<T>(Expression<T>/*!*/ lambda, LanguageContext/*!*/ context) {
+            return CompileLambda(lambda, context.DomainManager.Configuration.DebugMode, context.Options.NoAdaptiveCompilation);
+        }
+
+        internal static T/*!*/ CompileLambda<T>(Expression<T>/*!*/ lambda, bool debugMode, bool noAdaptiveCompilation) {
             if (debugMode) {
 #if !SILVERLIGHT
                 // try to use PDBs and fallback to CustomGenerator if not allowed to:
@@ -127,6 +131,8 @@
                 }
 #endif
                 return CompilerHelpers.CompileToMethod(lambda, new CustomGenerator(), false);
+            } else if (noAdaptiveCompilation) {
+                return lambda.Compile();
             } else {
                 return lambda.LightCompile();
             }
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/RubyUtils.cs;C870448
File: RubyUtils.cs
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/RubyUtils.cs;C870448  (server)    5/21/2009 11:36 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/RubyUtils.cs;NoAdaptive
@@ -600,7 +600,7 @@
                 targetScope = CreateModuleEvalScope(targetScope, self, module);
             }
 
-            return RubyScriptCode.CompileLambda(lambda, context.DomainManager.Configuration.DebugMode)(
+            return RubyScriptCode.CompileLambda(lambda, context)(
                 targetScope,
                 self,
                 module,
===================================================================