From 6f2bcc862ba2b1c344a9d0a5c62c691768a06bd3 Mon Sep 17 00:00:00 2001 From: Jacob Gravelle Date: Tue, 22 Aug 2017 17:42:44 +0000 Subject: [PATCH] [clang-diff] Refactor stop-after command-line flag Summary: Rename stop-after to stop-diff-after. When building LLVM with -DLLVM_BUILD_LLVM_DYLIB=ON, stop-after collides with the stop-after already present in LLVM. Reviewers: johannes, arphaman Subscribers: klimek, aheejin, cfe-commits Differential Revision: https://reviews.llvm.org/D36989 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@311476 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Tooling/clang-diff-topdown.cpp | 2 +- tools/clang-diff/ClangDiff.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Tooling/clang-diff-topdown.cpp b/test/Tooling/clang-diff-topdown.cpp index 8e78a03d83..d6c1d77033 100644 --- a/test/Tooling/clang-diff-topdown.cpp +++ b/test/Tooling/clang-diff-topdown.cpp @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -E %s > %t.src.cpp // RUN: %clang_cc1 -E %s > %t.dst.cpp -DDEST -// RUN: clang-diff -dump-matches -stop-after=topdown %t.src.cpp %t.dst.cpp -- -std=c++11 | FileCheck %s +// RUN: clang-diff -dump-matches -stop-diff-after=topdown %t.src.cpp %t.dst.cpp -- -std=c++11 | FileCheck %s // // Test the top-down matching of identical subtrees only. diff --git a/tools/clang-diff/ClangDiff.cpp b/tools/clang-diff/ClangDiff.cpp index 3f1980c702..7237e8c1af 100644 --- a/tools/clang-diff/ClangDiff.cpp +++ b/tools/clang-diff/ClangDiff.cpp @@ -50,7 +50,7 @@ static cl::opt DestinationPath(cl::Positional, cl::Optional, cl::cat(ClangDiffCategory)); -static cl::opt StopAfter("stop-after", +static cl::opt StopAfter("stop-diff-after", cl::desc(""), cl::Optional, cl::init(""), cl::cat(ClangDiffCategory)); -- 2.40.0