edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/IronPython/IronPython/Runtime/PythonContext.cs;C955511
File: PythonContext.cs
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/IronPython/IronPython/Runtime/PythonContext.cs;C955511  (server)    6/20/2009 8:41 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/IronPython/IronPython/Runtime/PythonContext.cs;GlobalNoAdaptive
@@ -588,7 +588,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.NoAdaptiveCompilation && !source.EmitDebugSymbols;
+            bool adaptiveCompilation = !LanguageOptions.NoAdaptiveCompilation && !source.EmitDebugSymbols;
 
             return options.Interpreted || adaptiveCompilation;
         }
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/IronRuby.Tests/Driver.cs;C955994
File: Driver.cs
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/IronRuby.Tests/Driver.cs;C955994  (server)    6/20/2009 8:42 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/IronRuby.Tests/Driver.cs;GlobalNoAdaptive
@@ -64,6 +64,7 @@
             if (_driver.SaveToAssemblies) {
                 Environment.SetEnvironmentVariable("DLR_AssembliesFileName", _testName);
             }
+            LanguageOptions.NoAdaptiveCompilation = _driver.NoAdaptiveCompilation;
 
             var runtimeSetup = ScriptRuntimeSetup.ReadConfiguration();
             LanguageSetup languageSetup = null;
@@ -76,7 +77,6 @@
 
             runtimeSetup.DebugMode = _driver.IsDebug;
             runtimeSetup.PrivateBinding = testCase.Options.PrivateBinding;
-            languageSetup.Options["NoAdaptiveCompilation"] = _driver.NoAdaptiveCompilation;
             languageSetup.Options["Verbosity"] = 2;
             languageSetup.Options["Compatibility"] = testCase.Options.Compatibility;
 
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/RubyScriptCode.cs;C933447
File: RubyScriptCode.cs
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/RubyScriptCode.cs;C933447  (server)    6/20/2009 8:41 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/RubyScriptCode.cs;GlobalNoAdaptive
@@ -114,10 +114,10 @@
         private static bool _HasPdbPermissions = true;
 
         internal static Delegate/*!*/ CompileLambda(LambdaExpression/*!*/ lambda, LanguageContext/*!*/ context) {
-            return CompileLambda(lambda, context.DomainManager.Configuration.DebugMode, context.Options.NoAdaptiveCompilation);
+            return CompileLambda(lambda, context.DomainManager.Configuration.DebugMode);
         }
 
-        internal static Delegate/*!*/ CompileLambda(LambdaExpression/*!*/ lambda, bool debugMode, bool noAdaptiveCompilation) {
+        internal static Delegate/*!*/ CompileLambda(LambdaExpression/*!*/ lambda, bool debugMode) {
             if (debugMode) {
 #if !SILVERLIGHT
                 // try to use PDBs and fallback to CustomGenerator if not allowed to:
@@ -131,7 +131,7 @@
                 }
 #endif
                 return CompilerHelpers.CompileToMethod(lambda, new CustomGenerator(), false);
-            } else if (noAdaptiveCompilation) {
+            } else if (LanguageOptions.NoAdaptiveCompilation) {
                 return lambda.Compile();
             } else {
                 return lambda.LightCompile();
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyMetaBinder.cs;C953692
File: RubyMetaBinder.cs
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyMetaBinder.cs;C953692  (server)    6/20/2009 8:41 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Ruby/Runtime/Calls/RubyMetaBinder.cs;GlobalNoAdaptive
@@ -51,8 +51,11 @@
         public abstract Expression CreateExpression();
 
         public override T BindDelegate<T>(System.Runtime.CompilerServices.CallSite<T> site, object[] args) {
+            if (LanguageOptions.NoAdaptiveCompilation) {
+                return base.BindDelegate<T>(site, args);
+            }
+
             InterpretedDispatcher dispatcher = MethodDispatcher.CreateInterpreted(typeof(T), args.Length);
-
             if (dispatcher == null) {
                 // call site has too many arguments:
                 PerfTrack.NoteEvent(PerfTrack.Categories.Binding, "Ruby: ! No dispatcher for " + Signature.ToString());
===================================================================