diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2015-10-29 23:03:42 +0000 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2015-11-14 20:59:19 +0100 |
| commit | 2bc3be72d52f29a9fd50a0f53ad977d2ec926841 (patch) | |
| tree | cd541735466961ca19d23cd7d3bec747ee3cf0b2 | |
| parent | 86318ff9572a79819b02f9a79b855fa4d4a41df2 (diff) | |
| download | haskell-ghc-7.10.3-rc3.tar.gz | |
x86 codegen: don't generate location commentsghc-7.10.3-rc3
The following source snippet 'module A where x */* y = 42'
when being compiled with '-g' option emits syntactically
invalid comment for GNU as:
.text
.align 8
.loc 1 3 1 /* */* */
Fixed by not emitting comments at all. We already suppress
all asm comments in 'X86/Ppr.hs'.
Signed-off-by: Sergei Trofimovich <siarheit@google.com>
Test Plan: added test and check it works
Reviewers: scpmw, simonmar, austin, bgamari
Reviewed By: simonmar
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1386
GHC Trac Issues: #10667
| -rw-r--r-- | compiler/nativeGen/X86/Ppr.hs | 5 | ||||
| -rw-r--r-- | testsuite/tests/codeGen/should_compile/T10667.hs | 6 | ||||
| -rw-r--r-- | testsuite/tests/codeGen/should_compile/all.T | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/compiler/nativeGen/X86/Ppr.hs b/compiler/nativeGen/X86/Ppr.hs index 7022e59647..d76e1e9057 100644 --- a/compiler/nativeGen/X86/Ppr.hs +++ b/compiler/nativeGen/X86/Ppr.hs @@ -506,9 +506,8 @@ pprInstr (COMMENT _) = empty -- nuke 'em pprInstr (COMMENT s) = ptext (sLit "# ") <> ftext s -} -pprInstr (LOCATION file line col name) - = ptext (sLit "\t.loc ") <> ppr file <+> ppr line <+> ppr col <> - ptext (sLit " /* ") <> text name <> ptext (sLit " */") +pprInstr (LOCATION file line col _name) + = ptext (sLit "\t.loc ") <> ppr file <+> ppr line <+> ppr col pprInstr (DELTA d) = pprInstr (COMMENT (mkFastString ("\tdelta = " ++ show d))) diff --git a/testsuite/tests/codeGen/should_compile/T10667.hs b/testsuite/tests/codeGen/should_compile/T10667.hs new file mode 100644 index 0000000000..665c764099 --- /dev/null +++ b/testsuite/tests/codeGen/should_compile/T10667.hs @@ -0,0 +1,6 @@ +module A where + +-- when used with '-g' debug generation option +-- '*/*' leaked into a /* comment */ and broke +-- GNU as. +x */* y = 42 diff --git a/testsuite/tests/codeGen/should_compile/all.T b/testsuite/tests/codeGen/should_compile/all.T index c78f9ac21a..ca71576e18 100644 --- a/testsuite/tests/codeGen/should_compile/all.T +++ b/testsuite/tests/codeGen/should_compile/all.T @@ -31,3 +31,4 @@ test('debug', extra_clean(['debug.cmm']), ['$MAKE -s --no-print-directory debug']) test('T9964', normal, compile, ['-O']) test('T10518', [cmm_src], compile, ['']) +test('T10667', normal, compile, ['-g']) |