From patchwork Sat Jan 7 15:08:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 90284 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp143192qgi; Sat, 7 Jan 2017 07:09:05 -0800 (PST) X-Received: by 10.99.181.76 with SMTP id u12mr149477393pgo.64.1483801745187; Sat, 07 Jan 2017 07:09:05 -0800 (PST) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id c17si66365384pgj.191.2017.01.07.07.09.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Jan 2017 07:09:05 -0800 (PST) Received-SPF: pass (google.com: domain of gdb-patches-return-136062-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of gdb-patches-return-136062-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gdb-patches-return-136062-patch=linaro.org@sourceware.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:from:date:message-id:subject:to :content-type; q=dns; s=default; b=ZtGZnCThRsVWpT8f37+B4PC+P8KPS iRStVxuFyUVzRV/KEzKQJYBiD+scU6yNqG/lnHireO6O9VBDrRJ8MhkqBTOySzF4 GUFmQga6xLrU6O7NnWfZMY2eZuaWK1uTsu2tnfZ5Zd1xsYiFrNXhhOHsDQPl9iXU DEZnBYiDXI9nrE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:from:date:message-id:subject:to :content-type; s=default; bh=pncEZtWaOWw6CyDRjEAxhK8ny7I=; b=y1V uUJVdZlGNkesr+4k1DrjqInfbYOSl0OCym4T4P2IW50WFqekVQHSykVIV9M+JdXa +Hez2zN9PAzB77fYr5EnPoCmaGQEh6Oz2nCIrmOM4hSx8FNrf9nIhqIHmPpZaAin uDJvafU0PSD2ALs0i7wVhvjdd9DPS9y8dlSnpYw0= Received: (qmail 20640 invoked by alias); 7 Jan 2017 15:08:58 -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 20622 invoked by uid 89); 7 Jan 2017 15:08:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Yacc, yacc, grammar, 651, 7 X-HELO: mail-vk0-f42.google.com Received: from mail-vk0-f42.google.com (HELO mail-vk0-f42.google.com) (209.85.213.42) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 07 Jan 2017 15:08:47 +0000 Received: by mail-vk0-f42.google.com with SMTP id x75so934547vke.2 for ; Sat, 07 Jan 2017 07:08:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=NyzUhXNt/rG6CsGO4HD5oNIx2vk25TdkPIrPlomjrqQ=; b=YxhA8kUmsx0O5wdPB3dCQqVZNrivF/wqvcHTOWM5UvuDX2uI/yL9PMZJlwSwOT7AWh jSGixPxY+Fwf1l7nmWNJvLK8zQxklTJKv3nPRY5fxrWmaNiwAL0MAVPxA8n/cEBKPxlX 7s9M0z1h+d5RK4DbupyuFcN8wltMDJ8t8HIm56Ei90DkchdTCLjdPczs9BljX360/JVX jBWJpiqcH92q/Mll4vUfxjbP2njopTgDrbLjlu0hvIbrrPQRChcqxEQVOjluv9/OVIKs fr0fog1dutcyTYtRAPspJAPyynPQV/JPdfJHZFP4OfmdFI7KG1VzdRg/B3/EYeFYq/jM zQsg== X-Gm-Message-State: AIkVDXK6N9AIYiUi135bzYcLLC8vJ6pN3tT+liTiTa7VOZ+EZLKu2PEj38CZtdNBqMsENuA5nMlKkm0cvAR6tg== X-Received: by 10.31.72.69 with SMTP id v66mr28848779vka.156.1483801725410; Sat, 07 Jan 2017 07:08:45 -0800 (PST) MIME-Version: 1.0 Received: by 10.176.18.199 with HTTP; Sat, 7 Jan 2017 07:08:44 -0800 (PST) From: Iain Buclaw Date: Sat, 7 Jan 2017 16:08:44 +0100 Message-ID: Subject: [PATCH] D: Fix classification of module.type in lexer To: GDB Patches X-IsSubscribed: yes The two-tier lexer, whose job is to resolve fully qualified names missed a case where 'module.type' was not being classified as one token. And so when the Yacc grammar kicks in, it resolved the tokens as "TypeExp . IdentifierExp", which then will never match the rule for cast expressions "( TypeExp ) UnaryExpression". Adding a case for TYPE_CODE_MODULE in type_aggregate_p means that classify_inner_name will get a chance to look-up the symbol. This was noticed when someone tried 'watch -l', and got the rather confusing response: A syntax error in expression, near `) 0x000000010'. So it's been included in the testsuite, along with another test that does effectively the same expression explicitly. 2017-01-07 Iain Buclaw gdb/ChangeLog: * d-exp.y (type_aggregate_p): Treat TYPE_CODE_MODULE as being aggregate-like. gdb/testsuite/ChangeLog: * gdb.dlang/watch-loc.c: New file. * gdb.dlang/watch-loc.exp: New file. --- diff --git a/gdb/d-exp.y b/gdb/d-exp.y index 077e645..2dab00e 100644 --- a/gdb/d-exp.y +++ b/gdb/d-exp.y @@ -651,6 +651,7 @@ type_aggregate_p (struct type *type) { return (TYPE_CODE (type) == TYPE_CODE_STRUCT || TYPE_CODE (type) == TYPE_CODE_UNION + || TYPE_CODE (type) == TYPE_CODE_MODULE || (TYPE_CODE (type) == TYPE_CODE_ENUM && TYPE_DECLARED_CLASS (type))); } diff --git a/gdb/testsuite/gdb.dlang/watch-loc.c b/gdb/testsuite/gdb.dlang/watch-loc.c new file mode 100644 index 0000000..725d1f1 --- /dev/null +++ b/gdb/testsuite/gdb.dlang/watch-loc.c @@ -0,0 +1,39 @@ +/* Copyright 2017 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + + +/* DWARF will describe these contents as being inside a D module. */ + +typedef struct tstruct +{ +} tstruct; + +tstruct my_data; + +asm ("dmain_start: .globl dmain_start"); + +int _Dmain (void) +{ + return 0; +} + +asm ("dmain_end: .globl dmain_end"); + +int +main (void) +{ + return _Dmain (); +} + diff --git a/gdb/testsuite/gdb.dlang/watch-loc.exp b/gdb/testsuite/gdb.dlang/watch-loc.exp new file mode 100644 index 0000000..b34a102 --- /dev/null +++ b/gdb/testsuite/gdb.dlang/watch-loc.exp @@ -0,0 +1,86 @@ +# Copyright (C) 2017 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test symbol lookup when there are multiple circular imports. + +load_lib "d-support.exp" +load_lib "dwarf.exp" + +if { [skip_d_tests] } { return -1 } + +# This test can only be run on targets which support DWARF-2 and use gas. +if {![dwarf2_support]} { + return 0 +} + +standard_testfile watch-loc.c watch-loc-dw.S + +# Make some DWARF for the test. +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + cu {} { + compile_unit { + {language @DW_LANG_D} + } { + declare_labels watch_module_label watch_struct_label + + extern dmain_start dmain_end + + watch_module_label: module { + {name watch} + } { + watch_struct_label: structure_type { + {name tstruct} + {byte_size 1 data1} + } + + tag_variable { + {name my_data} + {type :$watch_struct_label} + {location { + addr [gdb_target_symbol my_data] + } SPECIAL_expr} + {external 1 flag} + } + + subprogram { + {name "D main"} + {linkage_name "_Dmain"} + {external 1 flag_present} + {low_pc dmain_start addr} + {high_pc dmain_end addr} + } + } + } + } +} + +if { [prepare_for_testing "failed to prepare" ${testfile} \ + [list $srcfile $asm_file] {nodebug}] } { + return -1 +} + +gdb_test_no_output "set language d" + +if {![runto "_Dmain"]} { + return -1 +} + +# watch -l will rewrite the expression to "*(watch.tstruct *) 0x12345", +# this should not cause syntax error in the cast expression. +gdb_test "watch -l my_data" ".*atchpoint \[0-9\]+: -location my_data" + +# Same test as above, but done explicitly. +gdb_test "print *(watch.tstruct *) &my_data" "{}"