--- a/hotspot/src/share/vm/interpreter/templateTable.cpp	Wed Jun 04 13:51:09 2008 -0700
+++ b/hotspot/src/share/vm/interpreter/templateTable.cpp	Thu Jun 05 15:57:56 2008 -0700
@@ -172,6 +172,7 @@
 
 Template*                  TemplateTable::_desc;
 InterpreterMacroAssembler* TemplateTable::_masm;
+BarrierSet*                TemplateTable::_bs;
 
 
 void TemplateTable::def(Bytecodes::Code code, int flags, TosState in, TosState out, void (*gen)(), char filler) {
@@ -244,6 +245,8 @@
   // Initialize table
   TraceTime timer("TemplateTable initialization", TraceStartupTime);
 
+  _bs = Universe::heap()->barrier_set();
+
   // For better readability
   const char _    = ' ';
   const int  ____ = 0;