# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1434013560 -7200
# Node ID 9fed54b2b98f827df1620d63dd98d89a07b8ec74
# Parent  dfdbd9cd31c1d683904733b7796f33fdc94eceed
Fix bug in access to compressed metaspace pointers.

diff -r dfdbd9cd31c1 -r 9fed54b2b98f graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java	Wed Jun 10 17:56:40 2015 -0700
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java	Thu Jun 11 11:06:00 2015 +0200
@@ -102,9 +102,10 @@
                 ValueNode base = compression.graph().unique(new HeapBaseNode(heapBaseRegister));
                 addr.setBase(base);
             } else if (encoding.base != 0) {
-                long disp = addr.getDisplacement() + heapBase;
+                long disp = addr.getDisplacement() + encoding.base;
                 if (NumUtil.isInt(disp)) {
                     addr.setDisplacement((int) disp);
+                    addr.setBase(null);
                 } else {
                     return false;
                 }