From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26706 invoked by alias); 29 Oct 2014 18:50:44 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 26695 invoked by uid 89); 29 Oct 2014 18:50:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.1 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-ob0-f175.google.com Received: from mail-ob0-f175.google.com (HELO mail-ob0-f175.google.com) (209.85.214.175) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Wed, 29 Oct 2014 18:50:42 +0000 Received: by mail-ob0-f175.google.com with SMTP id wm4so2914506obc.34 for ; Wed, 29 Oct 2014 11:50:40 -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=gvr0WaslQs/p4LaURPoi96sb/g2WaATFun1CL1qRkQ0=; b=EtedGXls5J+gic3aW6ccTOtv/vCgvJwJrPJeMBHkrsGvI1lGe0pYXnaJtPZWiieEk5 ewRHJL8QR1Yll02cB4Pcm7rdsNkKTT7tSXrRre/kRe69HE5Rr2q3i1gppSibJOL+O6qi DVYR33J12YC5k2KSBLqMXhW6yRQ+EUS5C8NKDhQ/oFR9Wjhtz2EhCem2l5+x+edw6DTe ORKqE/dfOA3/9kwFsTnMoW7aP21S8/pCaS7jxaCbwrE/LdWBRVV28kQPfkBnLu3P+rN1 SJa5OqqRt3xf8Xd5/vRu0vLMB0jGbAgoLjTpkrahdxVAfc9+46oLnT7KKxPpbgsIBV34 Iw+Q== X-Gm-Message-State: ALoCoQnwqfkYpWBlGR+utllprv6MX9ZAWdmTYHqzB8siNN60QeYXXPso2klNe/1ty1PSTOTB06qD MIME-Version: 1.0 X-Received: by 10.202.170.21 with SMTP id t21mr9568856oie.5.1414608640255; Wed, 29 Oct 2014 11:50:40 -0700 (PDT) Received: by 10.202.197.13 with HTTP; Wed, 29 Oct 2014 11:50:39 -0700 (PDT) Date: Wed, 29 Oct 2014 18:50:00 -0000 Message-ID: Subject: [PATCH] Remove unwanted spaces when looking up builtin types From: Siva Chandra To: gdb-patches Content-Type: multipart/mixed; boundary=001a113cdf647fe3ee0506943d63 X-IsSubscribed: yes X-SW-Source: 2014-10/txt/msg00825.txt.bz2 --001a113cdf647fe3ee0506943d63 Content-Type: text/plain; charset=UTF-8 Content-length: 1088 Currently, if we do something like gdb.lookup_type(" unsigned long "), GDB errors out because of the leading and trailing spaces. The attached patch fixes this problem. A practical situation where this problem is hit is when invoking template methods. Its not uncommon to do things like this: (gdb) p foo.bar< unsigned long >() If "bar" happens to be an xmethod, then its implementation will typically need to parse the name of the method ("bar< unsigned long >" in the above example) to get the template argument and lookup the type. GDB currently fails for such cases. One could of course sanitize/fix such inputs in Python before calling lookup_type, but I think it is better done on the GDB side as having white spaces is valid syntax. For non-builtin types, lookup_type goes through the symbol lookup path. AFAIU, that path already ignores whitespaces. gdb/ChangeLog: * language.c (language_lookup_primitive_type_by_name): Remove unwanted space in the type name before looking it up. gdb/testsuite/ChangeLog: * gdb.python/py-type.exp: Add new tests. --001a113cdf647fe3ee0506943d63 Content-Type: text/plain; charset=US-ASCII; name="unwanted_space_v1.txt" Content-Disposition: attachment; filename="unwanted_space_v1.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i1v1evke0 Content-length: 3514 ZGlmZiAtLWdpdCBhL2dkYi9sYW5ndWFnZS5jIGIvZ2RiL2xhbmd1YWdlLmMK aW5kZXggMDM0MDg2ZC4uYWJmZWQ0MCAxMDA2NDQKLS0tIGEvZ2RiL2xhbmd1 YWdlLmMKKysrIGIvZ2RiL2xhbmd1YWdlLmMKQEAgLTk4MSw2ICs5ODEsMTcg QEAgbGFuZ3VhZ2VfYm9vbF90eXBlIChjb25zdCBzdHJ1Y3QgbGFuZ3VhZ2Vf ZGVmbiAqbGEsCiAgIHJldHVybiBsZC0+YXJjaF9pbmZvW2xhLT5sYV9sYW5n dWFnZV0uYm9vbF90eXBlX2RlZmF1bHQ7CiB9CiAKKy8qIFJldHVybiAxIGlm IEMgaXMgYSB3aGl0ZXNwYWNlIGNoYXJhY3RlciwgMCBvdGhlcndpc2UuICAq LworCitzdGF0aWMgaW50Cit3aGl0ZXNwYWNlX3AgKGNvbnN0IGNoYXIgYykK K3sKKyAgaWYgKGMgPT0gJyAnIHx8IGMgPT0gJ1xuJyB8fCBjID09ICdcdCcp CisgICAgcmV0dXJuIDE7CisgIGVsc2UKKyAgICByZXR1cm4gMDsKK30KKwog c3RydWN0IHR5cGUgKgogbGFuZ3VhZ2VfbG9va3VwX3ByaW1pdGl2ZV90eXBl X2J5X25hbWUgKGNvbnN0IHN0cnVjdCBsYW5ndWFnZV9kZWZuICpsYSwKIAkJ CQkJc3RydWN0IGdkYmFyY2ggKmdkYmFyY2gsCkBAIC05ODksMTQgKzEwMDAs NDQgQEAgbGFuZ3VhZ2VfbG9va3VwX3ByaW1pdGl2ZV90eXBlX2J5X25hbWUg KGNvbnN0IHN0cnVjdCBsYW5ndWFnZV9kZWZuICpsYSwKICAgc3RydWN0IGxh bmd1YWdlX2dkYmFyY2ggKmxkID0gZ2RiYXJjaF9kYXRhIChnZGJhcmNoLAog CQkJCQkgICAgICBsYW5ndWFnZV9nZGJhcmNoX2RhdGEpOwogICBzdHJ1Y3Qg dHlwZSAqY29uc3QgKnA7CisgIGludCBsZW4gPSBzdHJsZW4gKG5hbWUpOwor ICBpbnQgaSwgajsKKyAgY2hhciAqY2xlYW5fbmFtZSA9IChjaGFyICopIHht YWxsb2MgKHNpemVvZiAoY2hhcikgKiBsZW4gKyAxKTsKKworICAvKiBSZW1v dmUgdW53YW50ZWQgd2hpdGVzcGFjZSBpbiB0aGUgdHlwZW5hbWUuICBUaGlz IGNvdWxkIGhhcHBlbiwgZm9yCisgICAgIGV4YW1wbGUsIGhhcHBlbiBpZiBv bmUgZG9lcyBnZGIubG9va3VwX3R5cGUoJyB1bnNpZ25lZCBsb25nICcpIGlu CisgICAgIFB5dGhvbi4gICovCisgIGZvciAoaSA9IDAsIGogPSAwOyBpIDwg bGVuOyBpKyspCisgICAgeworICAgICAgaWYgKHdoaXRlc3BhY2VfcCAobmFt ZVtpXSkpCisJeworCSAgaWYgKGogPT0gMCB8fCBjbGVhbl9uYW1lW2ogLSAx XSA9PSAnICcpCisJICAgIGNvbnRpbnVlOworCX0KKworICAgICAgaWYgKHdo aXRlc3BhY2VfcCAobmFtZVtpXSkpCisJY2xlYW5fbmFtZVtqXSA9ICcgJzsK KyAgICAgIGVsc2UKKwljbGVhbl9uYW1lW2pdID0gbmFtZVtpXTsKKworICAg ICAgaisrOworICAgIH0KKyAgaWYgKGogPiAwICYmIGNsZWFuX25hbWVbaiAt IDFdID09ICcgJykKKyAgICBqLS07CisgIGNsZWFuX25hbWVbal0gPSAnXDAn OwogCiAgIGZvciAocCA9IGxkLT5hcmNoX2luZm9bbGEtPmxhX2xhbmd1YWdl XS5wcmltaXRpdmVfdHlwZV92ZWN0b3I7CiAgICAgICAgKCpwKSAhPSBOVUxM OwogICAgICAgIHArKykKICAgICB7Ci0gICAgICBpZiAoc3RyY21wIChUWVBF X05BTUUgKCpwKSwgbmFtZSkgPT0gMCkKLQlyZXR1cm4gKCpwKTsKKyAgICAg IGlmIChzdHJjbXAgKFRZUEVfTkFNRSAoKnApLCBjbGVhbl9uYW1lKSA9PSAw KQorCXsKKwkgIHhmcmVlIChjbGVhbl9uYW1lKTsKKwkgIHJldHVybiAoKnAp OworCX0KICAgICB9CisgIHhmcmVlIChjbGVhbl9uYW1lKTsKKwogICByZXR1 cm4gKE5VTEwpOwogfQogCmRpZmYgLS1naXQgYS9nZGIvdGVzdHN1aXRlL2dk Yi5weXRob24vcHktdHlwZS5leHAgYi9nZGIvdGVzdHN1aXRlL2dkYi5weXRo b24vcHktdHlwZS5leHAKaW5kZXggNmI2MWY0OC4uYzkzODhlZCAxMDA2NDQK LS0tIGEvZ2RiL3Rlc3RzdWl0ZS9nZGIucHl0aG9uL3B5LXR5cGUuZXhwCisr KyBiL2dkYi90ZXN0c3VpdGUvZ2RiLnB5dGhvbi9weS10eXBlLmV4cApAQCAt MjY0LDMgKzI2NCwxNSBAQCB3aXRoX3Rlc3RfcHJlZml4ICJsYW5nX2NwcCIg ewogICAgIHRlc3RfdGVtcGxhdGUKICAgICB0ZXN0X2VudW1zCiB9CisKKyMg VGVzdHMgdG8gbG9va3VwIGJ1aWx0aW4gdHlwZXMKK2dkYl90ZXN0ICJweXRo b24gcHJpbnQgZ2RiLmxvb2t1cF90eXBlICgndW5zaWduZWQgaW50JykiICJ1 bnNpZ25lZCBpbnQiIFwKKyAgICAibG9va3VwIHVuc2lnbmVkIGludCIKK2dk Yl90ZXN0ICJweXRob24gcHJpbnQgZ2RiLmxvb2t1cF90eXBlICgnIHVuc2ln bmVkIGxvbmcgJykiICJ1bnNpZ25lZCBsb25nIiBcCisgICAgImxvb2t1cCB1 bnNpZ25lZCBsb25nIgorZ2RiX3Rlc3QgInB5dGhvbiBwcmludCBnZGIubG9v a3VwX3R5cGUgKCcgdW5zaWduZWQgIGNoYXIgJykiICJ1bnNpZ25lZCBjaGFy IiBcCisgICAgImxvb2t1cCB1bnNpZ25lZCBjaGFyIgorZ2RiX3Rlc3QgInB5 dGhvbiBwcmludCBnZGIubG9va3VwX3R5cGUgKCcgdW5zaWduZWRcXG4gY2hh ciAnKSIgInVuc2lnbmVkIGNoYXIiIFwKKyAgICAibG9va3VwIHVuc2lnbmVk IGNoYXIiCitnZGJfdGVzdCAicHl0aG9uIHByaW50IGdkYi5sb29rdXBfdHlw ZSAoJyB1bnNpZ25lZFxcdGxvbmcgJykiICJ1bnNpZ25lZCBsb25nIiBcCisg ICAgImxvb2t1cCB1bnNpZ25lZCBsb25nIgo= --001a113cdf647fe3ee0506943d63--