commit ebe69fe11e48d322045d5949c83283927a0d790b
author Stephen Hines <srhines@google.com> Mon Mar 23 12:10:34 2015 -0700
committer Stephen Hines <srhines@google.com> Mon Mar 23 12:10:34 2015 -0700
tree c92f1907a6b8006628a4b01615f38264d29834ea
parent b7d2e72b02a4cb8034f32f8247a2558d2434e121

Update aosp/master LLVM for rebase to r230699.

Change-Id: I2b5be30509658cb8266be782de0ab24f9099f9b9

lib/CodeGen/ForwardControlFlowIntegrity.cpp

diff --git a/lib/CodeGen/ForwardControlFlowIntegrity.cpp b/lib/CodeGen/ForwardControlFlowIntegrity.cpp
index 5e7e853..63c3699 100644
--- a/lib/CodeGen/ForwardControlFlowIntegrity.cpp
+++ b/lib/CodeGen/ForwardControlFlowIntegrity.cpp
@@ -25,9 +25,9 @@
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/GlobalValue.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/InlineAsm.h"
 #include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/InlineAsm.h"
+#include "llvm/IR/Instructions.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Operator.h"