Skip to content

Commit 1cf97b8

Browse files
authored
Update to llvm main (#173)
1 parent 0c87039 commit 1cf97b8

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

llvm-sha.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
85daf6973d2bd3216b9d131be5be625b1227016c
1+
9f864a5447503d54d576736e2e095e145edc01f8

mlir/include/mlir-extensions/dialect/plier_util/PlierUtilOps.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def YieldOp : PlierUtil_Op<"yield", [
8686
let builders = [OpBuilder<(ins), [{/* nothing to do */}]>];
8787
// Override default verifier (defined in SCF_Op), no custom verification
8888
// needed.
89-
let verifier = ? ;
89+
let hasVerifier = 0;
9090
}
9191

9292
def RetainOp : PlierUtil_Op<"retain", [ViewLikeOpInterface]> {

tools/FileCheck/FileCheck.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
#include "llvm/FileCheck/FileCheck.h"
1919
#include "llvm/Support/CommandLine.h"
2020
#include "llvm/Support/InitLLVM.h"
21+
#include "llvm/Support/MemoryBuffer.h"
2122
#include "llvm/Support/Process.h"
23+
#include "llvm/Support/SourceMgr.h"
2224
#include "llvm/Support/WithColor.h"
2325
#include "llvm/Support/raw_ostream.h"
2426
#include <cmath>
@@ -408,7 +410,6 @@ BuildInputAnnotations(const SourceMgr &SM, unsigned CheckFileBufferID,
408410
"the check file or for an implicit pattern");
409411
if (DiagCountPerPattern[DiagItr->CheckLoc] > 1)
410412
Label << "'" << DiagIndexPerPattern[DiagItr->CheckLoc]++;
411-
Label.flush();
412413
LabelWidth = std::max((std::string::size_type)LabelWidth, A.Label.size());
413414

414415
A.Marker = GetMarker(DiagItr->MatchTy);
@@ -623,7 +624,7 @@ static void DumpAnnotatedInput(raw_ostream &OS, const FileCheckRequest &Req,
623624
// -dump-input-filter. However, in case the resulting ellipsis would occupy
624625
// more lines than the input lines and annotations it elides, buffer the
625626
// elided lines and annotations so we can print them instead.
626-
raw_ostream *LineOS = &OS;
627+
raw_ostream *LineOS;
627628
if ((!PrevLineInFilter || PrevLineInFilter + DumpInputContext < Line) &&
628629
(NextLineInFilter == UINT_MAX ||
629630
Line + DumpInputContext < NextLineInFilter))

0 commit comments

Comments
 (0)