This is an archive of the discontinued LLVM Phabricator instance.

Differential D61254

[UpdateTestChecks] Allow Lbegin_func without a leading period
ClosedPublic

Authored by mstorsjo on Apr 29 2019, 1:32 AM.

Details

Reviewers
rnk
chandlerc
Commits
rG6da0989cc4c1: [UpdateTestChecks] Allow Lbegin_func without a leading period
rL359497: [UpdateTestChecks] Allow Lbegin_func without a leading period
Summary

On mingw/i686, local labels don't start with a leading period.

Diff Detail

Event Timeline

mstorsjo created this revision.Apr 29 2019, 1:32 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 29 2019, 1:33 AM
rnk accepted this revision.Apr 29 2019, 11:08 AM

lgtm

utils/UpdateTestChecks/asm.py
17

Should the . be escaped too? Right now I think it matches anything.

This revision is now accepted and ready to land.Apr 29 2019, 11:08 AM
mstorsjo marked an inline comment as done.Apr 29 2019, 12:17 PM
mstorsjo added inline comments.
utils/UpdateTestChecks/asm.py
17

Yes, I believe so. I can amend it at the same time.

rnk added inline comments.Apr 29 2019, 1:20 PM
utils/UpdateTestChecks/asm.py
17

Let's do it.

Closed by commit rL359497: [UpdateTestChecks] Allow Lbegin_func without a leading period (authored by mstorsjo). · Explain WhyApr 29 2019, 1:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
utils/
UpdateTestChecks/
2 lines

Diff 197063

utils/UpdateTestChecks/asm.py

import re import re
import sys import sys
from . import common from . import common
if sys.version_info[0] > 2: if sys.version_info[0] > 2:
class string: class string:
expandtabs = str.expandtabs expandtabs = str.expandtabs
else: else:
import string import string
# RegEx: this is where the magic happens. # RegEx: this is where the magic happens.
##### Assembly parser ##### Assembly parser
ASM_FUNCTION_X86_RE = re.compile( ASM_FUNCTION_X86_RE = re.compile(
r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n(?:\s*.Lfunc_begin[^:\n]*:\n)?[^:]*?' r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n(?:\s*.?Lfunc_begin[^:\n]*:\n)?[^:]*?'
rnkUnsubmitted
Not Done
ReplyInline Actions

Should the . be escaped too? Right now I think it matches anything.

rnk: Should the `.` be escaped too? Right now I think it matches anything.
mstorsjoAuthorUnsubmitted
Done
ReplyInline Actions

Yes, I believe so. I can amend it at the same time.

mstorsjo: Yes, I believe so. I can amend it at the same time.
rnkUnsubmitted
Not Done
ReplyInline Actions

Let's do it.

rnk: Let's do it.
r'(?P<body>^##?[ \t]+[^:]+:.*?)\s*' r'(?P<body>^##?[ \t]+[^:]+:.*?)\s*'
r'^\s*(?:[^:\n]+?:\s*\n\s*\.size|\.cfi_endproc|\.globl|\.comm|\.(?:sub)?section|#+ -- End function)', r'^\s*(?:[^:\n]+?:\s*\n\s*\.size|\.cfi_endproc|\.globl|\.comm|\.(?:sub)?section|#+ -- End function)',
flags=(re.M | re.S)) flags=(re.M | re.S))
ASM_FUNCTION_ARM_RE = re.compile( ASM_FUNCTION_ARM_RE = re.compile(
r'^(?P<func>[0-9a-zA-Z_]+):\n' # f: (name of function) r'^(?P<func>[0-9a-zA-Z_]+):\n' # f: (name of function)
r'\s+\.fnstart\n' # .fnstart r'\s+\.fnstart\n' # .fnstart
r'(?P<body>.*?)\n' # (body of the function) r'(?P<body>.*?)\n' # (body of the function)
▲ Show 20 Lines • Show All 236 Lines • Show Last 20 Lines