From patchwork Mon Mar 21 20:59:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artemiy Volkov X-Patchwork-Id: 11458 Received: (qmail 76038 invoked by alias); 21 Mar 2016 21:02:26 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 75854 invoked by uid 89); 21 Mar 2016 21:02:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=adhere, *exp, 6297, 629, 7 X-HELO: mail-lb0-f194.google.com Received: from mail-lb0-f194.google.com (HELO mail-lb0-f194.google.com) (209.85.217.194) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Mon, 21 Mar 2016 21:02:17 +0000 Received: by mail-lb0-f194.google.com with SMTP id vk4so12123551lbb.1 for ; Mon, 21 Mar 2016 14:02:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=7onw5Vai9g6igUgTI6ZIOKxaSUKKWm3zT9OzsWB+81o=; b=ZRmBn7/1L73NNvVzoKOIWaxD+mh5aGxF4sr8EREFOgmRQ4bbBbRAUD++IHbiGM0oLt TTEOitHdoaK8tmtR6/c1D/hpOVEIHReINPChGUOqon6jGJt6B2WcjNQd8VFi2xckjmM2 155RBpLx4Zcmfi/FBLibr0lFiK1uQ5tSGuL3BSZxpp5rR/b3OGujNkwh25okkofuUoGy gD1cWel7H4NrMsawNnCtrGOpdQwupPVJpfVsddW7TIRXK4yweSzqUvFMdDo6Kq/fJ9jA uYIzTRV67vMyf8m3Cy6S7Xc+ol53I3TQMymK6iMxpAFYisOEqYQYHBUua3WGYsWAPVos hsmw== X-Gm-Message-State: AD7BkJLDCJZshy+eRrMhz9m4fIuJslHFFIpLpEXc99HI+tJ/2o1LpeL9QcJZZqF/Df/lbw== X-Received: by 10.112.134.138 with SMTP id pk10mr11592318lbb.16.1458594134462; Mon, 21 Mar 2016 14:02:14 -0700 (PDT) Received: from arch.smware.local (broadband-90-154-70-182.nationalcablenetworks.ru. [90.154.70.182]) by smtp.gmail.com with ESMTPSA id 40sm4730939lfp.41.2016.03.21.14.02.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Mar 2016 14:02:13 -0700 (PDT) From: Artemiy Volkov To: gdb-patches@sourceware.org Cc: keiths@redhat.com, palves@redhat.com, Artemiy Volkov Subject: [PATCH v4 03/11] [PR gdb/14441] gdb: valops: add ability to return rvalue reference values from value_ref() Date: Mon, 21 Mar 2016 13:59:10 -0700 Message-Id: <1458593958-25656-4-git-send-email-artemiyv@acm.org> In-Reply-To: <1458593958-25656-1-git-send-email-artemiyv@acm.org> References: <1457147955-21871-1-git-send-email-artemiyv@acm.org> <1458593958-25656-1-git-send-email-artemiyv@acm.org> X-IsSubscribed: yes Parameterize value_ref() by the kind of reference type the value of which is requested. Change all callers to use the new API. gdb/ChangeLog: 2016-03-21 Artemiy Volkov * ada-lang.c (ada_evaluate_subexp): Adhere to the new value_ref() interface. * c-valprint.c (c_value_print): Likewise. * infcall.c (value_arg_coerce): Likewise. * python/py-value.c (valpy_reference_value): Likewise. * valops.c (value_cast, value_reinterpret_cast) (value_dynamic_cast, typecmp): Likewise. (value_ref): Parameterize by kind of return value reference type. * value.h (value_ref): Add new parameter "refcode". --- gdb/ada-lang.c | 2 +- gdb/c-valprint.c | 10 +++++++--- gdb/infcall.c | 2 +- gdb/python/py-value.c | 2 +- gdb/valops.c | 25 +++++++++++++++++-------- gdb/value.h | 2 +- 6 files changed, 28 insertions(+), 15 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index d874129..585d729 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10724,7 +10724,7 @@ ada_evaluate_subexp (struct type *expect_type, struct expression *exp, should return a ref as it should be valid to ask for its address; so rebuild a ref after coerce. */ arg1 = ada_coerce_ref (arg1); - return value_ref (arg1); + return value_ref (arg1, TYPE_CODE_REF); } } diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c index 62552ec..7c8d9be 100644 --- a/gdb/c-valprint.c +++ b/gdb/c-valprint.c @@ -602,10 +602,14 @@ c_value_print (struct value *val, struct ui_file *stream, else if (options->objectprint && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_STRUCT)) { - int is_ref = TYPE_CODE (type) == TYPE_CODE_REF; + int is_ref = TYPE_IS_REFERENCE (type); + enum type_code refcode = TYPE_CODE_UNDEF; if (is_ref) - val = value_addr (val); + { + val = value_addr (val); + refcode = TYPE_CODE (type); + } /* Pointer to class, check real type of object. */ fprintf_filtered (stream, "("); @@ -625,7 +629,7 @@ c_value_print (struct value *val, struct ui_file *stream, if (is_ref) { - val = value_ref (value_ind (val)); + val = value_ref (value_ind (val), refcode); type = value_type (val); } diff --git a/gdb/infcall.c b/gdb/infcall.c index 77cd931..ad2512a 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -169,7 +169,7 @@ value_arg_coerce (struct gdbarch *gdbarch, struct value *arg, if the value was not previously in memory - in some cases we should clearly be allowing this, but how? */ new_value = value_cast (TYPE_TARGET_TYPE (type), arg); - new_value = value_ref (new_value); + new_value = value_ref (new_value, TYPE_CODE (type)); return new_value; } case TYPE_CODE_INT: diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index be08231..141f180 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -249,7 +249,7 @@ valpy_reference_value (PyObject *self, PyObject *args) struct cleanup *cleanup = make_cleanup_value_free_to_mark (value_mark ()); self_val = ((value_object *) self)->value; - result = value_to_value_object (value_ref (self_val)); + result = value_to_value_object (value_ref (self_val, TYPE_CODE_REF)); do_cleanups (cleanup); } diff --git a/gdb/valops.c b/gdb/valops.c index 1aafb5a..1f423a0 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -372,7 +372,7 @@ value_cast (struct type *type, struct value *arg2) struct type *dereftype = check_typedef (TYPE_TARGET_TYPE (t1)); struct value *val = value_cast (dereftype, arg2); - return value_ref (val); + return value_ref (val, TYPE_CODE (t1)); } code2 = TYPE_CODE (check_typedef (value_type (arg2))); @@ -622,7 +622,8 @@ value_reinterpret_cast (struct type *type, struct value *arg) error (_("Invalid reinterpret_cast")); if (is_ref) - result = value_cast (type, value_ref (value_ind (result))); + result = value_cast (type, value_ref (value_ind (result), + TYPE_CODE (type))); return result; } @@ -816,7 +817,9 @@ value_dynamic_cast (struct type *type, struct value *arg) arg_type, &result) == 1) return value_cast (type, - is_ref ? value_ref (result) : value_addr (result)); + is_ref + ? value_ref (result, TYPE_CODE (resolved_type)) + : value_addr (result)); } /* The second dynamic check specified in 5.2.7. */ @@ -828,7 +831,9 @@ value_dynamic_cast (struct type *type, struct value *arg) value_address (tem), tem, rtti_type, &result) == 1) return value_cast (type, - is_ref ? value_ref (result) : value_addr (result)); + is_ref + ? value_ref (result, TYPE_CODE (resolved_type)) + : value_addr (result)); if (TYPE_CODE (resolved_type) == TYPE_CODE_PTR) return value_zero (type, not_lval); @@ -1499,16 +1504,20 @@ value_addr (struct value *arg1) contents. */ struct value * -value_ref (struct value *arg1) +value_ref (struct value *arg1, enum type_code refcode) { struct value *arg2; struct type *type = check_typedef (value_type (arg1)); - if (TYPE_CODE (type) == TYPE_CODE_REF) + gdb_assert (refcode == TYPE_CODE_REF || refcode == TYPE_CODE_RVALUE_REF); + + if ((TYPE_CODE (type) == TYPE_CODE_REF + || TYPE_CODE (type) == TYPE_CODE_RVALUE_REF) + && TYPE_CODE (type) == refcode) return arg1; arg2 = value_addr (arg1); - deprecated_set_value_type (arg2, lookup_lvalue_reference_type (type)); + deprecated_set_value_type (arg2, lookup_reference_type (type, refcode)); return arg2; } @@ -1715,7 +1724,7 @@ typecmp (int staticp, int varargs, int nargs, if (TYPE_CODE (tt2) == TYPE_CODE_ARRAY) t2[i] = value_coerce_array (t2[i]); else - t2[i] = value_ref (t2[i]); + t2[i] = value_ref (t2[i], TYPE_CODE (tt1)); continue; } diff --git a/gdb/value.h b/gdb/value.h index 2eac5ef..db1b7bf 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -725,7 +725,7 @@ extern struct value *value_ind (struct value *arg1); extern struct value *value_addr (struct value *arg1); -extern struct value *value_ref (struct value *arg1); +extern struct value *value_ref (struct value *arg1, enum type_code refcode); extern struct value *value_assign (struct value *toval, struct value *fromval);