*** old/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Fri Jan 15 11:50:54 2010
--- new/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Fri Jan 15 11:50:54 2010

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
!  * Copyright 2003-2010 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 1454,1463 ****
--- 1454,1480 ----
  
    return ((InterpreterGenerator*) this)->
                                  generate_normal_entry(synchronized);
  }
  
+ // These should never be compiled since the interpreter will prefer
+ // the compiled version to the intrinsic version.
+ bool AbstractInterpreter::can_be_compiled(methodHandle m) {
+   switch (method_kind(m)) {
+     case Interpreter::java_lang_math_sin     : // fall thru
+     case Interpreter::java_lang_math_cos     : // fall thru
+     case Interpreter::java_lang_math_tan     : // fall thru
+     case Interpreter::java_lang_math_abs     : // fall thru
+     case Interpreter::java_lang_math_log     : // fall thru
+     case Interpreter::java_lang_math_log10   : // fall thru
+     case Interpreter::java_lang_math_sqrt    :
+       return false;
+     default:
+       return true;
+   }
+ }
+ 
  // How much stack a method activation needs in words.
  int AbstractInterpreter::size_top_interpreter_activation(methodOop method) {
    const int entry_size = frame::interpreter_frame_monitor_size();
  
    // total overhead size: entry_size + (saved rbp thru expr stack