Index: osprey/be/cg/cgemit.cxx
===================================================================
--- osprey/be/cg/cgemit.cxx     (revision 3796)
+++ osprey/be/cg/cgemit.cxx     (working copy)
@@ -3311,13 +3311,11 @@
     TN* base_tn = NULL;

     ST* st = TN_var(tn);
-    Base_Symbol_And_Offset( st, &base_st, &base_ofst );
+    Base_Symbol_And_Offset_For_Addressing( st, TN_offset(tn), &base_st, &base_ofst );

 #ifdef TARG_NVISA
     // symbols are not really laid out in memory yet, so ignore base_ofst
     base_ofst = TN_offset(tn);
-#else
-    base_ofst += TN_offset(tn);
 #endif

     char* buf = (char*)alloca(strlen(ST_name(st)) + /* EXTRA_NAME_LEN */ 64);