diff --git a/mozilla/ef/Compiler/CodeGenerator/Burg.h b/mozilla/ef/Compiler/CodeGenerator/Burg.h
index bc93bf3d462..37fb92f51f8 100644
--- a/mozilla/ef/Compiler/CodeGenerator/Burg.h
+++ b/mozilla/ef/Compiler/CodeGenerator/Burg.h
@@ -30,7 +30,7 @@
 typedef Primitive* NODEPTR_TYPE;
 
 #define OP_LABEL(p)					p->getOperation()
-#define STATE_LABEL(p)				p->getBurgState()
+#define STATE_LABEL(p)				*(p->getBurgStatePtr())
 #define SET_STATE_LABEL(p, state)	p->setBurgState(state)
 #define LEFT_CHILD(p)				CodeGenerator::getExpressionLeftChild(p)
 #define RIGHT_CHILD(p)				CodeGenerator::getExpressionRightChild(p)	
diff --git a/mozilla/ef/Compiler/PrimitiveGraph/Primitives.h b/mozilla/ef/Compiler/PrimitiveGraph/Primitives.h
index 287aae87746..0d5ce1f0eda 100644
--- a/mozilla/ef/Compiler/PrimitiveGraph/Primitives.h
+++ b/mozilla/ef/Compiler/PrimitiveGraph/Primitives.h
@@ -416,6 +416,7 @@ class Primitive: public DataNode, public DoublyLinkedEntry<Primitive> // Links t
 	void changeContainer(ControlNode *c) {assert(container); remove(); container = c;} // For use by ControlNode only.
 
 	Uint16 getBurgState() const { return burgState;}
+    Uint16* getBurgStatePtr() { return &burgState; }
 	Uint16 setBurgState(Uint16 newState) {burgState = newState; return newState;}
 
 	Uint16 getLineNumber() {return lineNumber;}