--- a/hotspot/src/cpu/x86/vm/frame_x86.hpp	Tue Dec 22 11:03:37 2015 +0100
+++ b/hotspot/src/cpu/x86/vm/frame_x86.hpp	Tue Dec 22 11:11:29 2015 -0500
@@ -101,8 +101,6 @@
     // non-interpreter frames
     sender_sp_offset                                 =  2,
 
-#ifndef CC_INTERP
-
     // Interpreter frames
     interpreter_frame_result_handler_offset          =  3, // for native calls only
     interpreter_frame_oop_temp_offset                =  2, // for native calls only
@@ -120,8 +118,6 @@
     interpreter_frame_monitor_block_top_offset       = interpreter_frame_initial_sp_offset,
     interpreter_frame_monitor_block_bottom_offset    = interpreter_frame_initial_sp_offset,
 
-#endif // CC_INTERP
-
     // Entry frames
 #ifdef AMD64
 #ifdef _WIN64
@@ -193,13 +189,7 @@
   // helper to update a map with callee-saved RBP
   static void update_map_with_saved_link(RegisterMap* map, intptr_t** link_addr);
 
-#ifndef CC_INTERP
   // deoptimization support
   void interpreter_frame_set_last_sp(intptr_t* sp);
-#endif // CC_INTERP
-
-#ifdef CC_INTERP
-  inline interpreterState get_interpreterState() const;
-#endif // CC_INTERP
 
 #endif // CPU_X86_VM_FRAME_X86_HPP