--- a/src/share/vm/code/debugInfo.hpp	Thu Mar 07 15:17:51 2013 +0100
+++ b/src/share/vm/code/debugInfo.hpp	Thu Mar 07 21:00:29 2013 +0100
@@ -88,64 +88,6 @@
   void print_on(outputStream* st) const;
 };
 
-#ifdef GRAAL
-
-class DeferredLocationValue: public ScopeValue {
-private:
-  ScopeValue* _base;
-  ScopeValue* _index;
-  jint _scale;
-  jlong _disp;
-public:
-  DeferredLocationValue(ScopeValue* base, ScopeValue* index, jint scale, jlong disp)
-  : _base(base), _index(index), _scale(scale), _disp(disp) { }
-
-  ScopeValue* base() { return _base; }
-  ScopeValue* index() { return _index; }
-  jint scale() { return _scale; }
-  jlong disp() { return _disp; }
-
-  // Serialization of debugging information
-  DeferredLocationValue(DebugInfoReadStream* stream);
-  void write_on(DebugInfoWriteStream* stream);
-
-  // Printing
-  void print_on(outputStream* st) const;
-};
-
-
-class DeferredReadValue: public DeferredLocationValue {
-public:
-  DeferredReadValue(ScopeValue* base, ScopeValue* index, jint scale, jint disp)
-  : DeferredLocationValue(base, index, scale, disp) { }
-
-  // Serialization of debugging information
-  DeferredReadValue(DebugInfoReadStream* stream);
-  void write_on(DebugInfoWriteStream* stream);
-
-  // Printing
-  void print_on(outputStream* st) const;
-};
-
-class DeferredWriteValue: public DeferredLocationValue {
-private:
-  ScopeValue* _value;
-public:
-  DeferredWriteValue(ScopeValue* base, ScopeValue* index, jint scale, jint disp, ScopeValue* value)
-  : DeferredLocationValue(base, index, scale, disp), _value(value) { }
-
-  ScopeValue* value() { return _value; }
-
-  // Serialization of debugging information
-  DeferredWriteValue(DebugInfoReadStream* stream);
-  void write_on(DebugInfoWriteStream* stream);
-
-  // Printing
-  void print_on(outputStream* st) const;
-};
-
-#endif // GRAAL
-
 
 // An ObjectValue describes an object eliminated by escape analysis.