Merge rust-lang#23

23: Fix formatting. r=ltratt a=vext01



Co-authored-by: Edd Barrett <[email protected]>

Author: bors[bot]

.buildbot.sh

@@ -2,6 +2,11 @@
 
 set -e
 
+# Buildbot will have done a shallow clone, but the formatting step requires
+# both full git history, and a complete set of upstream llvm release tags.
+git fetch --unshallow
+git fetch --tags https://github.com/llvm/llvm-project
+
 INST_DIR=`pwd`/inst
 
 mkdir -p build
@@ -14,18 +19,20 @@ cmake -DCMAKE_INSTALL_PREFIX=${INST_DIR} \
     ../llvm
 make -j `nproc` install
 
+# clang-format any new files that we've introduced ourselves.
+cd ..
+PATH=${INST_DIR}/bin:${PATH}
+sh yk_format_new_files.sh
+git diff --exit-code
+
 # There are many test suites for LLVM:
 # https://llvm.org/docs/TestingGuide.html
 #
 # This runs unit and integration tests.
+cd build
 make -j `nproc` check-all
 cd ..
 
-# clang-format any new files that we've introduced ourselves.
-PATH=${INST_DIR}/bin:${PATH}
-sh yk_format_new_files.sh
-git diff --exit-code
-
 # FIXME The commented code below should run the `test-suite` tests, as
 # described at https://llvm.org/docs/TestSuiteGuide.html.
 #

llvm/lib/Transforms/Yk/ControlPoint.cpp

@@ -168,13 +168,16 @@ class YkControlPoint : public ModulePass {
     // The old control point should be of the form:
     //    control_point(YkMT*, YkLocation*)
     assert(OldCtrlPointCall->arg_size() == YK_OLD_CONTROL_POINT_NUM_ARGS);
-    Type *YkMTTy = OldCtrlPointCall->getArgOperand(YK_CONTROL_POINT_ARG_MT_IDX)->getType();
-    Type *YkLocTy = OldCtrlPointCall->getArgOperand(YK_CONTROL_POINT_ARG_LOC_IDX)->getType();
+    Type *YkMTTy =
+        OldCtrlPointCall->getArgOperand(YK_CONTROL_POINT_ARG_MT_IDX)->getType();
+    Type *YkLocTy =
+        OldCtrlPointCall->getArgOperand(YK_CONTROL_POINT_ARG_LOC_IDX)
+            ->getType();
 
     // Create the new control point.
-    FunctionType *FType =
-        FunctionType::get(Type::getVoidTy(Context),
-                          {YkMTTy, YkLocTy, CtrlPointVarsTy->getPointerTo()}, false);
+    FunctionType *FType = FunctionType::get(
+        Type::getVoidTy(Context),
+        {YkMTTy, YkLocTy, CtrlPointVarsTy->getPointerTo()}, false);
     Function *NF = Function::Create(FType, GlobalVariable::ExternalLinkage,
                                     YK_NEW_CONTROL_POINT, M);
 
@@ -197,11 +200,9 @@ class YkControlPoint : public ModulePass {
 
     // Insert call to the new control point.
     Instruction *NewCtrlPointCallInst = Builder.CreateCall(
-        NF, {
-          OldCtrlPointCall->getArgOperand(YK_CONTROL_POINT_ARG_MT_IDX),
-          OldCtrlPointCall->getArgOperand(YK_CONTROL_POINT_ARG_LOC_IDX),
-          InputStruct
-        });
+        NF, {OldCtrlPointCall->getArgOperand(YK_CONTROL_POINT_ARG_MT_IDX),
+             OldCtrlPointCall->getArgOperand(YK_CONTROL_POINT_ARG_LOC_IDX),
+             InputStruct});
 
     // Once the control point returns we need to extract the (potentially
     // mutated) values from the returned YkCtrlPointStruct and reassign them to

yk_format_new_files.sh

@@ -2,6 +2,8 @@
 #
 # Format any new files that we have added in our fork.
 
+set -e
+
 # The LLVM version tag we are forked from.
 FORKED_LLVM_VERSION=`git describe --abbrev=0 --match 'llvmorg-*'`