--- old/hotspot/src/share/vm/interpreter/templateTable.cpp	2009-08-01 04:11:49.943660530 +0100
+++ new/hotspot/src/share/vm/interpreter/templateTable.cpp	2009-08-01 04:11:49.858263086 +0100
@@ -175,6 +175,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) {
@@ -247,6 +248,8 @@
   // Initialize table
   TraceTime timer("TemplateTable initialization", TraceStartupTime);
 
+  _bs = Universe::heap()->barrier_set();
+
   // For better readability
   const char _    = ' ';
   const int  ____ = 0;