update clang-format to 11
MODIFY
.custom-format.py
.custom-format.py
@@ -29,7 +29,7 @@ CLANG_FORMAT_BIN = os.getenv("CLANG_FORMAT_BIN")
if CLANG_FORMAT_BIN is None:
o = 0
try:
- p = subprocess.Popen(["clang-format-10", "--version"], stdout=subprocess.PIPE)
+ p = subprocess.Popen(["clang-format-11", "--version"], stdout=subprocess.PIPE)
o, _ = p.communicate()
o = str(o, "utf-8")
o = re.sub(r".*ersion ", "", o)
@@ -37,7 +37,7 @@ if CLANG_FORMAT_BIN is None:
o = o[:o.find(".")]
o = int(o)
except:
- print ("clang-format-10 is needed. Aborted.")
+ print ("clang-format-11 is needed. Aborted.")
exit(1)
#if o < 7:
# if subprocess.call(['which', 'clang-format-7'], stdout=subprocess.PIPE) == 0:
@@ -46,13 +46,13 @@ if CLANG_FORMAT_BIN is None:
# CLANG_FORMAT_BIN = 'clang-format-8'
# elif subprocess.call(['which', 'clang-format-9'], stdout=subprocess.PIPE) == 0:
# CLANG_FORMAT_BIN = 'clang-format-9'
- # elif subprocess.call(['which', 'clang-format-10'], stdout=subprocess.PIPE) == 0:
- # CLANG_FORMAT_BIN = 'clang-format-10'
+ # elif subprocess.call(['which', 'clang-format-11'], stdout=subprocess.PIPE) == 0:
+ # CLANG_FORMAT_BIN = 'clang-format-11'
# else:
# print ("clang-format 7 or above is needed. Aborted.")
# exit(1)
else:
- CLANG_FORMAT_BIN = 'clang-format-10'
+ CLANG_FORMAT_BIN = 'clang-format-11'
COLUMN_LIMIT = 80
for line in fmt.split("\n"):

MODIFY
instrumentation/SanitizerCoveragePCGUARD.so.cc
instrumentation/SanitizerCoveragePCGUARD.so.cc
@@ -1127,11 +1127,11 @@ void ModuleSanitizerCoverage::InjectTraceForCmp(
Value * A1 = ICMP->getOperand(1);
if (!A0->getType()->isIntegerTy()) continue;
uint64_t TypeSize = DL->getTypeStoreSizeInBits(A0->getType());
- int CallbackIdx =
- TypeSize == 8
- ? 0
+ int CallbackIdx = TypeSize == 8 ? 0
: TypeSize == 16 ? 1
- : TypeSize == 32 ? 2 : TypeSize == 64 ? 3 : -1;
+ : TypeSize == 32 ? 2
+ : TypeSize == 64 ? 3
+ : -1;
if (CallbackIdx < 0) continue;
// __sanitizer_cov_trace_cmp((type_size << 32) | predicate, A0, A1);
auto CallbackFunc = SanCovTraceCmpFunction[CallbackIdx];

MODIFY
instrumentation/split-compares-pass.so.cc
instrumentation/split-compares-pass.so.cc
@@ -601,11 +601,8 @@ size_t SplitComparesTransform::splitFPCompares(Module &M) {
if (op_size != op1->getType()->getPrimitiveSizeInBits()) { continue; }
const unsigned int sizeInBits = op0->getType()->getPrimitiveSizeInBits();
- const unsigned int precision =
- sizeInBits == 32
- ? 24
- : sizeInBits == 64
- ? 53
+ const unsigned int precision = sizeInBits == 32 ? 24
+ : sizeInBits == 64 ? 53
: sizeInBits == 128 ? 113
: sizeInBits == 16 ? 11
/* sizeInBits == 80 */

update clang-format to 11