--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp	Fri Mar 04 13:16:50 2016 +0000
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp	Mon Mar 07 09:34:29 2016 +0100
@@ -441,10 +441,7 @@
   void do_SwitchRanges(SwitchRangeArray* x, LIR_Opr value, BlockBegin* default_sux);
 
   void do_RuntimeCall(address routine, Intrinsic* x);
-#ifdef TRACE_HAVE_INTRINSICS
-  void do_ThreadIDIntrinsic(Intrinsic* x);
-  void do_ClassIDIntrinsic(Intrinsic* x);
-#endif
+
   ciKlass* profile_type(ciMethodData* md, int md_first_offset, int md_offset, intptr_t profiled_k,
                         Value arg, LIR_Opr& mdp, bool not_null, ciKlass* signature_at_call_k,
                         ciKlass* callee_signature_k);