[cfe-commits] r160542 - in /cfe/trunk: docs/UsersManual.html lib/Frontend/TextDiagnostic.cpp test/FixIt/fixit-unicode.c test/Parser/objc-diag-width.mm
Nico Weber
nicolasweber at gmx.de
Thu Jul 19 23:44:52 PDT 2012
Author: nico
Date: Fri Jul 20 01:44:52 2012
New Revision: 160542
URL: http://llvm.org/viewvc/llvm-project?rev=160542&view=rev
Log:
Revert r160319, it caused PR13417. Add a test for PR13417.
Added:
cfe/trunk/test/Parser/objc-diag-width.mm
Modified:
cfe/trunk/docs/UsersManual.html
cfe/trunk/lib/Frontend/TextDiagnostic.cpp
cfe/trunk/test/FixIt/fixit-unicode.c
Modified: cfe/trunk/docs/UsersManual.html
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/UsersManual.html?rev=160542&r1=160541&r2=160542&view=diff
==============================================================================
--- cfe/trunk/docs/UsersManual.html (original)
+++ cfe/trunk/docs/UsersManual.html Fri Jul 20 01:44:52 2012
@@ -230,9 +230,6 @@
<p>When this is disabled, Clang will print "test.c:28: warning..." with no
column number.</p>
-
-<p>The printed column numbers count bytes from the beginning of the line; take
-care if your source contains multibyte characters.</p>
</dd>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -399,9 +396,6 @@
</pre>
<p>The {}'s are generated by -fdiagnostics-print-source-range-info.</p>
-
-<p>The printed column numbers count bytes from the beginning of the line; take
-care if your source contains multibyte characters.</p>
</dd>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -422,9 +416,6 @@
"\\"), tabs (as "\t"), newlines (as "\n"), double
quotes(as "\"") and non-printable characters (as octal
"\xxx").</p>
-
-<p>The printed column numbers count bytes from the beginning of the line; take
-care if your source contains multibyte characters.</p>
</dd>
<dt id="opt_fno-elide-type">
Modified: cfe/trunk/lib/Frontend/TextDiagnostic.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/TextDiagnostic.cpp?rev=160542&r1=160541&r2=160542&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/TextDiagnostic.cpp (original)
+++ cfe/trunk/lib/Frontend/TextDiagnostic.cpp Fri Jul 20 01:44:52 2012
@@ -1124,7 +1124,7 @@
std::string FixItInsertionLine;
if (Hints.empty() || !DiagOpts.ShowFixits)
return FixItInsertionLine;
- unsigned PrevHintEndCol = 0;
+ unsigned PrevHintEnd = 0;
for (ArrayRef<FixItHint>::iterator I = Hints.begin(), E = Hints.end();
I != E; ++I) {
@@ -1136,15 +1136,11 @@
if (LineNo == SM.getLineNumber(HintLocInfo.first, HintLocInfo.second)) {
// Insert the new code into the line just below the code
// that the user wrote.
- // Note: When modifying this function, be very careful about what is a
- // "column" (printed width, platform-dependent) and what is a
- // "byte offset" (SourceManager "column").
- unsigned HintByteOffset
+ unsigned HintColNo
= SM.getColumnNumber(HintLocInfo.first, HintLocInfo.second) - 1;
-
- // The hint must start inside the source or right at the end
- assert(HintByteOffset < static_cast<unsigned>(map.bytes())+1);
- unsigned HintCol = map.byteToColumn(HintByteOffset);
+ // hint must start inside the source or right at the end
+ assert(HintColNo<static_cast<unsigned>(map.bytes())+1);
+ HintColNo = map.byteToColumn(HintColNo);
// If we inserted a long previous hint, push this one forwards, and add
// an extra space to show that this is not part of the previous
@@ -1153,27 +1149,32 @@
//
// Note that if this hint is located immediately after the previous
// hint, no space will be added, since the location is more important.
- if (HintCol < PrevHintEndCol)
- HintCol = PrevHintEndCol + 1;
+ if (HintColNo < PrevHintEnd)
+ HintColNo = PrevHintEnd + 1;
+
+ // FIXME: if the fixit includes tabs or other characters that do not
+ // take up a single column per byte when displayed then
+ // I->CodeToInsert.size() is not a column number and we're mixing
+ // units (columns + bytes). We should get printable versions
+ // of each fixit before using them.
+ unsigned LastColumnModified
+ = HintColNo + I->CodeToInsert.size();
+
+ if (LastColumnModified <= static_cast<unsigned>(map.bytes())) {
+ // If we're right in the middle of a multibyte character skip to
+ // the end of it.
+ while (map.byteToColumn(LastColumnModified) == -1)
+ ++LastColumnModified;
+ LastColumnModified = map.byteToColumn(LastColumnModified);
+ }
- // FIXME: This function handles multibyte characters in the source, but
- // not in the fixits. This assertion is intended to catch unintended
- // use of multibyte characters in fixits. If we decide to do this, we'll
- // have to track separate byte widths for the source and fixit lines.
- assert((size_t)llvm::sys::locale::columnWidth(I->CodeToInsert) ==
- I->CodeToInsert.size());
-
- // This relies on one byte per column in our fixit hints.
- // This should NOT use HintByteOffset, because the source might have
- // Unicode characters in earlier columns.
- unsigned LastColumnModified = HintCol + I->CodeToInsert.size();
if (LastColumnModified > FixItInsertionLine.size())
FixItInsertionLine.resize(LastColumnModified, ' ');
-
+ assert(HintColNo+I->CodeToInsert.size() <= FixItInsertionLine.size());
std::copy(I->CodeToInsert.begin(), I->CodeToInsert.end(),
- FixItInsertionLine.begin() + HintCol);
+ FixItInsertionLine.begin() + HintColNo);
- PrevHintEndCol = LastColumnModified;
+ PrevHintEnd = LastColumnModified;
} else {
FixItInsertionLine.clear();
break;
Modified: cfe/trunk/test/FixIt/fixit-unicode.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit-unicode.c?rev=160542&r1=160541&r2=160542&view=diff
==============================================================================
--- cfe/trunk/test/FixIt/fixit-unicode.c (original)
+++ cfe/trunk/test/FixIt/fixit-unicode.c Fri Jul 20 01:44:52 2012
@@ -1,11 +1,10 @@
// RUN: %clang_cc1 -fsyntax-only %s 2>&1 | FileCheck -strict-whitespace %s
-// RUN: %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits %s 2>&1 | FileCheck -check-prefix=CHECK-MACHINE %s
+// PR13312
struct Foo {
int bar;
};
-// PR13312
void test1() {
struct Foo foo;
(&foo)â>bar = 42;
@@ -13,21 +12,4 @@
// Make sure we emit the fixit right in front of the snowman.
// CHECK: {{^ \^}}
// CHECK: {{^ ;}}
-
-// CHECK-MACHINE: fix-it:"{{.*}}fixit-unicode.c":{11:9-11:9}:";"
-}
-
-
-int printf(const char *, ...);
-void test2() {
- printf("â: %d", 1L);
-// CHECK: warning: format specifies type 'int' but the argument has type 'long'
-// Don't crash emitting a fixit after the delta.
-// CHECK: printf("
-// CHECK: : %d", 1L);
-// Unfortunately, we can't actually check the location of the printed fixit,
-// because different systems will render the delta differently (either as a
-// character, or as <U+2206>.) The fixit should line up with the %d regardless.
-
-// CHECK-MACHINE: fix-it:"{{.*}}fixit-unicode.c":{23:16-23:18}:"%ld"
}
Added: cfe/trunk/test/Parser/objc-diag-width.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/objc-diag-width.mm?rev=160542&view=auto
==============================================================================
--- cfe/trunk/test/Parser/objc-diag-width.mm (added)
+++ cfe/trunk/test/Parser/objc-diag-width.mm Fri Jul 20 01:44:52 2012
@@ -0,0 +1,8 @@
+// RUN: %clang_cc1 %s 2>&1 | FileCheck %s
+
+// Just shouldn't crash. -verify suppresses the crash, so don't use it.
+// PR13417
+// CHECK-NOT: Assertion failed
+ at interface ExtensionActionContextMenu @end
+ at implementation ExtensionActionContextMenu
+namespace {
More information about the cfe-commits
mailing list