From patchwork Thu Oct 16 14:38:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Chandra Reddy X-Patchwork-Id: 3248 Received: (qmail 18915 invoked by alias); 16 Oct 2014 14:38:21 -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 18902 invoked by uid 89); 16 Oct 2014 14:38:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mail-oi0-f53.google.com Received: from mail-oi0-f53.google.com (HELO mail-oi0-f53.google.com) (209.85.218.53) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 16 Oct 2014 14:38:17 +0000 Received: by mail-oi0-f53.google.com with SMTP id v63so2793837oia.12 for ; Thu, 16 Oct 2014 07:38:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=kCIBzKZLBUvzZsSTPIjsJrArITgu+fF/6YMi70AkbOc=; b=UQZsI1sAKixDZFZUp9SW0wCUlTFtA+lHY28U/zJaH2m90/q2yo/LSl0Y6sJ9TX2qwm 0LNWqsaOFK2JGyp0ctRotrwaMCqqqZr8/7o2ZuMI+z/kL9MeqOyN7oLmefLHo4jc6VvO bw9Wox67zSH+AQpm2dt6EKoKY0AprhnJiblLzkdrJsrZp/yKAWLlvJBi2IHM468RlSZw MEAqeXnFMSrW8+GX2VLay+4GubqRKtV981xVLcGcbx9dRo/kwUd08gaLAir7qpsfnIy+ sSo7p1y9hY9eWsc4iKPaJkrfZple+Iul4i4Ye1k4+2ZGZuSK6QuImzXgufaYq4gvD6QF T4iw== X-Gm-Message-State: ALoCoQk0xto46PaHDMSHCYkFNQ2SC15qUXypGzWvIPQpwcH7jz+irVX8bWnmHQlT7hWgpQOkjbOc MIME-Version: 1.0 X-Received: by 10.202.104.210 with SMTP id o79mr1260964oik.41.1413470295352; Thu, 16 Oct 2014 07:38:15 -0700 (PDT) Received: by 10.202.197.13 with HTTP; Thu, 16 Oct 2014 07:38:15 -0700 (PDT) Date: Thu, 16 Oct 2014 07:38:15 -0700 Message-ID: Subject: [PATCH] Guard a call to TYPE_TARGET_TYPE in gnuv3_pass_by_reference From: Siva Chandra To: Doug Evans , gdb-patches X-IsSubscribed: yes A call to TYPE_TARGET_TYPE was being done without checking if the type does have a target type. This was introduced by my commit: 82c48ac732edb0155288a93ef3dd39625ff2d2e1 The attached patch fixes it. This probably qualifies as an obvious fix, but just in case. 2014-10-16 Siva Chandra Reddy * gnu-v3-abi.c (gnuv3_pass_by_reference): Call TYPE_TARGET_TYPE on the arg type of a constructor only if it is of reference type. diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c index a6c6f9f..b960aa3 100644 --- a/gdb/gnu-v3-abi.c +++ b/gdb/gnu-v3-abi.c @@ -1320,13 +1320,15 @@ gnuv3_pass_by_reference (struct type *type) if (TYPE_NFIELDS (fieldtype) == 2) { struct type *arg_type = TYPE_FIELD_TYPE (fieldtype, 1); - struct type *arg_target_type; - arg_target_type = check_typedef (TYPE_TARGET_TYPE (arg_type)); + if (TYPE_CODE (arg_type) == TYPE_CODE_REF) + { + struct type *arg_target_type; - if (TYPE_CODE (arg_type) == TYPE_CODE_REF - && class_types_same_p (arg_target_type, type)) - return 1; + arg_target_type = check_typedef (TYPE_TARGET_TYPE (arg_type)); + if (class_types_same_p (arg_target_type, type)) + return 1; + } } }