Merge GDB 7.5.1

gdb/dwarf2expr.c

 /* DWARF 2 Expression Evaluator.
 
    Copyright (C) 2001-2003, 2005, 2007-2012 Free Software Foundation,
    Inc.
 
    Contributed by Daniel Berlin (dan@dberlin.org)
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
@@ skipping 324 matching lines @@
          cases in the evaluator.  */
       ctx->location = DWARF_VALUE_OPTIMIZED_OUT;
     }
   else if (p->location == DWARF_VALUE_MEMORY)
     {
       p->v.mem.addr = dwarf_expr_fetch_address (ctx, 0);
       p->v.mem.in_stack_memory = dwarf_expr_fetch_in_stack_memory (ctx, 0);
     }
   else if (p->location == DWARF_VALUE_IMPLICIT_POINTER)
     {
-      p->v.ptr.die = ctx->len;
+      p->v.ptr.die.cu_off = ctx->len;
       p->v.ptr.offset = value_as_long (dwarf_expr_fetch (ctx, 0));
     }
   else if (p->location == DWARF_VALUE_REGISTER)
     p->v.regno = value_as_long (dwarf_expr_fetch (ctx, 0));
   else
     {
       p->v.value = dwarf_expr_fetch (ctx, 0);
     }
 }
 
 /* Evaluate the expression at ADDR (LEN bytes long) using the context
    CTX.  */
 
 void
 dwarf_expr_eval (struct dwarf_expr_context *ctx, const gdb_byte *addr,
                  size_t len)
 {
   int old_recursion_depth = ctx->recursion_depth;
 
   execute_stack_op (ctx, addr, addr + len);
 
   /* CTX RECURSION_DEPTH becomes invalid if an exception was thrown here.  */