diff -r 08222df07d0d -r 0712796e4039 hotspot/src/share/vm/classfile/vmSymbols.hpp
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp	Tue Oct 20 13:36:20 2015 +0000
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp	Tue Oct 20 18:07:28 2015 +0200
@@ -1402,7 +1402,7 @@
 
   // Returns true if a compiler intrinsic is disabled by command-line flags
   // and false otherwise.
-  static bool is_disabled_by_flags(methodHandle method, methodHandle compilation_context);
+  static bool is_disabled_by_flags(methodHandle method);
 };
 
 #endif // SHARE_VM_CLASSFILE_VMSYMBOLS_HPP