TCF Agent: symbols: better handling of a piece of an object that is present in the source but not in the object code (perhaps due to optimization)

1 files changed, 9 insertions, 1 deletions

diff --git a/agent/tcf/framework/cpudefs.c b/agent/tcf/framework/cpudefs.c
index 2d027f6e..ef3d471a 100644
--- a/agent/tcf/framework/cpudefs.c
+++ b/agent/tcf/framework/cpudefs.c
@@ -497,8 +497,12 @@ void read_location_pieces(Context * ctx, StackFrame * frame,
         unsigned piece_bits = piece->bit_size ? piece->bit_size : piece->size * 8;
         uint8_t * pbf = NULL;
         uint8_t * rbf = NULL;
+        if (piece->optimized_away) {
+            set_errno(ERR_OTHER, "Cannot get symbol value: optimized away");
+            exception(errno);
+        }
         if (piece->implicit_pointer) {
-            set_errno(ERR_OTHER, "Symbol value unknown: implicit pointer");
+            set_errno(ERR_OTHER, "Cannot get symbol value: implicit pointer");
             exception(errno);
         }
         if (piece->reg) {
@@ -555,6 +559,10 @@ void write_location_pieces(Context * ctx, StackFrame * frame,
         unsigned piece_bits = piece->bit_size ? piece->bit_size : piece->size * 8;
         uint8_t * pbf = NULL;
         uint8_t * rbf = NULL;
+        if (piece->optimized_away) {
+            set_errno(ERR_OTHER, "Cannot set symbol value: optimized away");
+            exception(errno);
+        }
         if (piece->implicit_pointer) {
             set_errno(ERR_OTHER, "Cannot set symbol value: implicit pointer");
             exception(errno);