[AliasSetTracker] Do not treat experimental_guard intrinsic as memory writing instruction

[mkazantsev]

Summary

The experimental_guard intrinsic has memory write semantics to model the thread-exiting
logic, but does not do any actual writes to memory. Currently, AliasSetTracker treats it as a
normal memory write. As result, a loop-invariant load cannot be hoisted out of loop because
the guard may possibly alias with it.

This patch makes AliasSetTracker so that it doesn't treat guards as memory writes.

[reames]

lib/Analysis/AliasSetTracker.cpp

446 ↗

(On Diff #159877)

This is incorrect. Guards don't write, but they do read everything. As such, they must participate in the aliasing with the Ref state.

counter example:
for (int i = 0; i < N; i++)

guard(LIC);
store x = 5;

}

The store and guard must in the same alias set.

[mkazantsev]

Looking for a correct way to solve this.

[mkazantsev]

I hope that this approach is a correct one. Also added a dedicated test.

[reames]

You need much more careful and exhaustive testing. At minimum, I want to see combinations of multiple guards, load/guard, store/guard, unrelated call/guard, etc..

test/Analysis/AliasSet/intrinsics.ll

21 ↗

(On Diff #160058)

Ah, not sure what went wrong here, but this output is wrong. a, and b, must be in the same AliasSet as the guard. Both a and b modify memory read by the guard. (Unless, this might be specific to allocas which are thread local... if so, you need testing for the case where a and b are not alloca!)

25 ↗

(On Diff #160058)

You can simplify this by making the argument the i1.

[mkazantsev]

test/Analysis/AliasSet/intrinsics.ll

21 ↗

(On Diff #160058)

My best guess is that locally allocated objects never alias. I will add more tests to see what happens.

25 ↗

(On Diff #160058)

I can, but I just copied it from the test above to clearly show the output difference.

[mkazantsev]

Added some tests.

[mkazantsev]

JFYI: I've run our internal Fuzzer suite with this patch (5k tests) and it passed ok.

[reames]

Request for additional specific tests has not been addressed. See previous review comment.

lib/Analysis/AliasSetTracker.cpp

173 ↗

(On Diff #160311)

nitpick, but can you change this comment to:
// guards are marked as modifying memory for control flow modelling purposes, but don't actually modify any specific memory location.

[sanjoy]

Will marking guards with inaccessiblememonly do the right thing?

[sanjoy]

Even if we have to make this same change to AST after using inaccessiblememonly for guards, that seems cleaner than special casing guards here.

[mkazantsev]

In D50497#1197564, @sanjoy wrote:

Will marking guards with inaccessiblememonly do the right thing?

No, guard's read semantics applies to accessible memory as well.

[mkazantsev]

Rebased on top of my new comprehensive tests of alias set tracker for guards, fixed comment.

[reames]

LGTM. Thanks for all the testing enhancements!

llvm/trunk/lib/Analysis/AliasSetTracker.cpp

 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/InstIterator.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Module.h"
+#include "llvm/IR/PatternMatch.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/AtomicOrdering.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/ErrorHandling.h"
if (Alias == SetMayAlias)
     AST.TotalMayAliasSetSize++;
 }
 
 void AliasSet::addUnknownInst(Instruction *I, AliasAnalysis &AA) {
   if (UnknownInsts.empty())
     addRef();
   UnknownInsts.emplace_back(I);
 
-  if (!I->mayWriteToMemory()) {
+  // Guards are marked as modifying memory for control flow modelling purposes,
+  // but don't actually modify any specific memory location.
+  using namespace PatternMatch;
+  bool MayWriteMemory = I->mayWriteToMemory() &&
+                        !match(I, m_Intrinsic<Intrinsic::experimental_guard>());
+  if (!MayWriteMemory) {
     Alias = SetMayAlias;
     Access |= RefAccess;
     return;
   }
 
   // FIXME: This should use mod/ref information to make this not suck so bad
   Alias = SetMayAlias;
   Access = ModRefAccess;

llvm/trunk/test/Analysis/AliasSet/guards.ll

 ; RUN: opt -basicaa -print-alias-sets -S -o - < %s 2>&1 | FileCheck %s
 declare void @llvm.experimental.guard(i1, ...)
 
 ; CHECK: Alias sets for function 'test0':
 ; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %a, 1)
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Mod/Ref
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %b, 1)
 define void @test0(i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %b = alloca i8, align 1
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test1':
 ; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %a, 1)
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Mod/Ref
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
 define void @test1(i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %b = alloca i8, align 1
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test2':
 ; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Mod/Ref
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %b, 1)
 define void @test2(i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %b = alloca i8, align 1
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %0 = load i8, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test3':
 ; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Mod/Ref
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
 define void @test3(i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %b = alloca i8, align 1
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test4':
 ; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Mod/Ref
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %a, 1)
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %b, 1)
 define void @test4(i1 %cond_a) {
 entry:
   %a = alloca i8, align 1
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   %1 = load i8, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test5':
 ; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Mod/Ref
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %a, 1)
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
 define void @test5(i1 %cond_a) {
 entry:
   %a = alloca i8, align 1
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test6':
 ; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Mod/Ref
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %b, 1)
 define void @test6(i1 %cond_a) {
 entry:
   %a = alloca i8, align 1
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   %0 = load i8, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test7':
 ; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Mod/Ref
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
 define void @test7(i1 %cond_a) {
 entry:
   %a = alloca i8, align 1
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test8':
 ; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Mod/Ref
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %a, 1)
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %b, 1)
 define void @test8(i1 %cond_a, i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test9':
 ; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Mod/Ref
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %a, 1)
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
 define void @test9(i1 %cond_a, i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test10':
 ; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Mod/Ref
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %b, 1)
 define void @test10(i1 %cond_a, i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %0 = load i8, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test11':
 ; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Mod/Ref
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
 define void @test11(i1 %cond_a, i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test12':
 ; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %a, 1)
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Ref       Pointers: (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 define void @test12(i8* %b, i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
   ret void
entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test14':
 ; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Ref       Pointers: (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 define void @test14(i8* %b, i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %0 = load i8, i8* %b
   ret void
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test16':
 ; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Ref       Pointers: (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %a, 1)
 define void @test16(i1 %cond_a, i8* %b) {
 entry:
   %a = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   %1 = load i8, i8* %b
entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test18':
 ; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Ref       Pointers: (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
 define void @test18(i1 %cond_a, i8* %b) {
 entry:
   %a = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   %0 = load i8, i8* %b
entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test20':
 ; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Ref       Pointers: (i8* %b, 1)
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %a, 1)
 define void @test20(i1 %cond_a, i8* %b, i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
entry:
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test22':
 ; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Ref       Pointers: (i8* %b, 1)
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
 define void @test22(i1 %cond_a, i8* %b, i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test24':
 ; CHECK: Alias Set Tracker: 2 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8** %ptr_b, 8), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8** %ptr_b, 8), (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %a, 1)
 define void @test24(i8** %ptr_b, i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %b = load i8*, i8** %ptr_b
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
entry:
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test26':
 ; CHECK: Alias Set Tracker: 2 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8** %ptr_b, 8), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8** %ptr_b, 8), (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
 define void @test26(i8** %ptr_b, i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %b = load i8*, i8** %ptr_b
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test28':
 ; CHECK: Alias Set Tracker: 2 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8** %ptr_b, 8), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8** %ptr_b, 8), (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %a, 1)
 define void @test28(i1 %cond_a, i8** %ptr_b) {
 entry:
   %a = alloca i8, align 1
   %b = load i8*, i8** %ptr_b
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test30':
 ; CHECK: Alias Set Tracker: 2 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8** %ptr_b, 8), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8** %ptr_b, 8), (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
 define void @test30(i1 %cond_a, i8** %ptr_b) {
 entry:
   %a = alloca i8, align 1
   %b = load i8*, i8** %ptr_b
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test32':
 ; CHECK: Alias Set Tracker: 2 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8** %ptr_b, 8), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8** %ptr_b, 8), (i8* %b, 1)
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %a, 1)
 define void @test32(i1 %cond_a, i8** %ptr_b, i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %b = load i8*, i8** %ptr_b
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
entry:
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test34':
 ; CHECK: Alias Set Tracker: 2 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8** %ptr_b, 8), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8** %ptr_b, 8), (i8* %b, 1)
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
 define void @test34(i1 %cond_a, i8** %ptr_b, i1 %cond_b) {
 entry:
   %a = alloca i8, align 1
   %b = load i8*, i8** %ptr_b
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test36':
 ; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Ref       Pointers: (i8* %a, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %b, 1)
 define void @test36(i8* %a, i1 %cond_b) {
 entry:
   %b = alloca i8, align 1
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test37':
 ; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Ref       Pointers: (i8* %a, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
 define void @test37(i8* %a, i1 %cond_b) {
 entry:
   %b = alloca i8, align 1
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test40':
 ; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Ref       Pointers: (i8* %a, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %b, 1)
 define void @test40(i8* %a, i1 %cond_a) {
 entry:
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   %1 = load i8, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test41':
 ; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Ref       Pointers: (i8* %a, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
 define void @test41(i8* %a, i1 %cond_a) {
 entry:
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   store i8 1, i8* %b
entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test44':
 ; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Ref       Pointers: (i8* %a, 1)
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %b, 1)
 define void @test44(i8* %a, i1 %cond_a, i1 %cond_b) {
 entry:
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test45':
 ; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Ref       Pointers: (i8* %a, 1)
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
 define void @test45(i8* %a, i1 %cond_a, i1 %cond_b) {
 entry:
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test48':
 ; CHECK: Alias Set Tracker: 1 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8* %a, 1), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8* %a, 1), (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 define void @test48(i8* %a, i8* %b, i1 %cond_b) {
 entry:
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
   ret void
 }
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test52':
 ; CHECK: Alias Set Tracker: 1 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8* %a, 1), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8* %a, 1), (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 define void @test52(i8* %a, i1 %cond_a, i8* %b) {
 entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   %1 = load i8, i8* %b
   ret void
 }
entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test56':
 ; CHECK: Alias Set Tracker: 1 alias sets for 2 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8* %a, 1), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8* %a, 1), (i8* %b, 1)
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 define void @test56(i8* %a, i1 %cond_a, i8* %b, i1 %cond_b) {
 entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
   ret void
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test60':
 ; CHECK: Alias Set Tracker: 1 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 4] may alias, Mod/Ref   Pointers: (i8** %ptr_b, 8), (i8* %a, 1), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 4] may alias, Ref       Pointers: (i8** %ptr_b, 8), (i8* %a, 1), (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 define void @test60(i8* %a, i8** %ptr_b, i1 %cond_b) {
 entry:
   %b = load i8*, i8** %ptr_b
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
   ret void
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test64':
 ; CHECK: Alias Set Tracker: 1 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 4] may alias, Mod/Ref   Pointers: (i8** %ptr_b, 8), (i8* %a, 1), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 4] may alias, Ref       Pointers: (i8** %ptr_b, 8), (i8* %a, 1), (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 define void @test64(i8* %a, i1 %cond_a, i8** %ptr_b) {
 entry:
   %b = load i8*, i8** %ptr_b
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   %1 = load i8, i8* %b
   ret void
entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test68':
 ; CHECK: Alias Set Tracker: 1 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 4] may alias, Mod/Ref   Pointers: (i8** %ptr_b, 8), (i8* %a, 1), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 4] may alias, Ref       Pointers: (i8** %ptr_b, 8), (i8* %a, 1), (i8* %b, 1)
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 define void @test68(i8* %a, i1 %cond_a, i8** %ptr_b, i1 %cond_b) {
 entry:
   %b = load i8*, i8** %ptr_b
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test72':
 ; CHECK: Alias Set Tracker: 2 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8** %ptr_a, 8), (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8** %ptr_a, 8), (i8* %a, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %b, 1)
 define void @test72(i8** %ptr_a, i1 %cond_b) {
 entry:
   %a = load i8*, i8** %ptr_a
   %b = alloca i8, align 1
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test73':
 ; CHECK: Alias Set Tracker: 2 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8** %ptr_a, 8), (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8** %ptr_a, 8), (i8* %a, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
 define void @test73(i8** %ptr_a, i1 %cond_b) {
 entry:
   %a = load i8*, i8** %ptr_a
   %b = alloca i8, align 1
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test76':
 ; CHECK: Alias Set Tracker: 2 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8** %ptr_a, 8), (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8** %ptr_a, 8), (i8* %a, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %b, 1)
 define void @test76(i8** %ptr_a, i1 %cond_a) {
 entry:
   %a = load i8*, i8** %ptr_a
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   %1 = load i8, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test77':
 ; CHECK: Alias Set Tracker: 2 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8** %ptr_a, 8), (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8** %ptr_a, 8), (i8* %a, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
 define void @test77(i8** %ptr_a, i1 %cond_a) {
 entry:
   %a = load i8*, i8** %ptr_a
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test80':
 ; CHECK: Alias Set Tracker: 2 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8** %ptr_a, 8), (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8** %ptr_a, 8), (i8* %a, 1)
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Ref       Pointers: (i8* %b, 1)
 define void @test80(i8** %ptr_a, i1 %cond_a, i1 %cond_b) {
 entry:
   %a = load i8*, i8** %ptr_a
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test81':
 ; CHECK: Alias Set Tracker: 2 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8** %ptr_a, 8), (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Ref       Pointers: (i8** %ptr_a, 8), (i8* %a, 1)
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 ; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
 define void @test81(i8** %ptr_a, i1 %cond_a, i1 %cond_b) {
 entry:
   %a = load i8*, i8** %ptr_a
   %b = alloca i8, align 1
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test84':
 ; CHECK: Alias Set Tracker: 1 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 4] may alias, Mod/Ref   Pointers: (i8** %ptr_a, 8), (i8* %a, 1), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 4] may alias, Ref       Pointers: (i8** %ptr_a, 8), (i8* %a, 1), (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 define void @test84(i8** %ptr_a, i8* %b, i1 %cond_b) {
 entry:
   %a = load i8*, i8** %ptr_a
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
   ret void
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test88':
 ; CHECK: Alias Set Tracker: 1 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 4] may alias, Mod/Ref   Pointers: (i8** %ptr_a, 8), (i8* %a, 1), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 4] may alias, Ref       Pointers: (i8** %ptr_a, 8), (i8* %a, 1), (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 define void @test88(i8** %ptr_a, i1 %cond_a, i8* %b) {
 entry:
   %a = load i8*, i8** %ptr_a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   %1 = load i8, i8* %b
   ret void
entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test92':
 ; CHECK: Alias Set Tracker: 1 alias sets for 3 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 4] may alias, Mod/Ref   Pointers: (i8** %ptr_a, 8), (i8* %a, 1), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 4] may alias, Ref       Pointers: (i8** %ptr_a, 8), (i8* %a, 1), (i8* %b, 1)
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 define void @test92(i8** %ptr_a, i1 %cond_a, i8* %b, i1 %cond_b) {
 entry:
   %a = load i8*, i8** %ptr_a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test96':
 ; CHECK: Alias Set Tracker: 1 alias sets for 4 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 5] may alias, Mod/Ref   Pointers: (i8** %ptr_a, 8), (i8** %ptr_b, 8), (i8* %a, 1), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 5] may alias, Ref       Pointers: (i8** %ptr_a, 8), (i8** %ptr_b, 8), (i8* %a, 1), (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 define void @test96(i8** %ptr_a, i8** %ptr_b, i1 %cond_b) {
 entry:
   %a = load i8*, i8** %ptr_a
   %b = load i8*, i8** %ptr_b
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   %1 = load i8, i8* %b
entry:
   store i8 0, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test100':
 ; CHECK: Alias Set Tracker: 1 alias sets for 4 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 5] may alias, Mod/Ref   Pointers: (i8** %ptr_a, 8), (i8** %ptr_b, 8), (i8* %a, 1), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 5] may alias, Ref       Pointers: (i8** %ptr_a, 8), (i8** %ptr_b, 8), (i8* %a, 1), (i8* %b, 1)
 ; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
 define void @test100(i8** %ptr_a, i1 %cond_a, i8** %ptr_b) {
 entry:
   %a = load i8*, i8** %ptr_a
   %b = load i8*, i8** %ptr_b
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   %1 = load i8, i8* %b
entry:
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   store i8 0, i8* %a
   store i8 1, i8* %b
   ret void
 }
 
 ; CHECK: Alias sets for function 'test104':
 ; CHECK: Alias Set Tracker: 1 alias sets for 4 pointer values.
-; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 5] may alias, Mod/Ref   Pointers: (i8** %ptr_a, 8), (i8** %ptr_b, 8), (i8* %a, 1), (i8* %b, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 5] may alias, Ref       Pointers: (i8** %ptr_a, 8), (i8** %ptr_b, 8), (i8* %a, 1), (i8* %b, 1)
 ; CHECK:     2 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ],   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]
 define void @test104(i8** %ptr_a, i1 %cond_a, i8** %ptr_b, i1 %cond_b) {
 entry:
   %a = load i8*, i8** %ptr_a
   %b = load i8*, i8** %ptr_b
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_a) [ "deopt"() ]
   %0 = load i8, i8* %a
   call void (i1, ...) @llvm.experimental.guard(i1 %cond_b) [ "deopt"() ]

llvm/trunk/test/Analysis/AliasSet/intrinsics.ll

entry:
   %b = alloca i8, align 1
   store i8 1, i8* %a, align 1
   %cond1 = icmp ne i32 %c, 0
   call void @llvm.assume(i1 %cond1)
   store i8 1, i8* %b, align 1
   ret void
 }
 
+; CHECK: Alias sets for function 'test2':
+; CHECK: Alias Set Tracker: 3 alias sets for 2 pointer values.
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %a, 1)
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] may alias, Ref
+; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond1) [ "deopt"() ]
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
+define void @test2(i32 %c) {
+entry:
+  %a = alloca i8, align 1
+  %b = alloca i8, align 1
+  store i8 1, i8* %a, align 1
+  %cond1 = icmp ne i32 %c, 0
+  call void (i1, ...) @llvm.experimental.guard(i1 %cond1)["deopt"()]
+  store i8 1, i8* %b, align 1
+  ret void
+}
+
+; CHECK: Alias sets for function 'test3':
+; CHECK: Alias Set Tracker: 1 alias sets for 2 pointer values.
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 3] may alias, Mod/Ref   Pointers: (i8* %a, 1), (i8* %b, 1)
+; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond1) [ "deopt"() ]
+define void @test3(i32 %c, i8* %a, i8* %b) {
+entry:
+  store i8 1, i8* %a, align 1
+  %cond1 = icmp ne i32 %c, 0
+  call void (i1, ...) @llvm.experimental.guard(i1 %cond1)["deopt"()]
+  store i8 1, i8* %b, align 1
+  ret void
+}
+
+; CHECK: Alias sets for function 'test4':
+; CHECK: Alias Set Tracker: 2 alias sets for 2 pointer values.
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 2] may alias, Mod/Ref   Pointers: (i8* %a, 1)
+; CHECK:     1 Unknown instructions:   call void (i1, ...) @llvm.experimental.guard(i1 %cond1) [ "deopt"() ]
+; CHECK:   AliasSet[0x{{[0-9a-f]+}}, 1] must alias, Mod       Pointers: (i8* %b, 1)
+define void @test4(i32 %c, i8* %a) {
+entry:
+  %b = alloca i8, align 1
+  store i8 1, i8* %a, align 1
+  %cond1 = icmp ne i32 %c, 0
+  call void (i1, ...) @llvm.experimental.guard(i1 %cond1)["deopt"()]
+  store i8 1, i8* %b, align 1
+  ret void
+}
+
 declare void @llvm.assume(i1)
+declare void @llvm.experimental.guard(i1, ...)

llvm/trunk/test/Transforms/LICM/hoist-mustexec.ll

 ; RUN: opt -S -basicaa -licm < %s | FileCheck %s
 ; RUN: opt -aa-pipeline=basic-aa -passes='require<opt-remark-emit>,loop(licm)' -S %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 declare void @f() nounwind
+declare void @llvm.experimental.guard(i1,...)
 
 ; constant fold on first ieration
 define i32 @test1(i32* noalias nocapture readonly %a) nounwind uwtable {
 ; CHECK-LABEL: @test1(
 entry:
 ; CHECK: %i1 = load i32, i32* %a, align 4
 ; CHECK-NEXT: br label %for.body
   br label %for.body

 for.cond.cleanup:
   ret i32 %add
 
 fail:
   call void @f()
   ret i32 -1
 }
 
+define void @test-hoisting-in-presence-of-guards(i1 %c, i32* %p) {
+
+; CHECK-LABEL: @test-hoisting-in-presence-of-guards
+; CHECK:       entry:
+; CHECK:         %a = load i32, i32* %p
+; CHECK:         %invariant_cond = icmp ne i32 %a, 100
+; CHECK:       loop:
+
+entry:
+  br label %loop
+
+loop:
+  %iv = phi i32 [ 0, %entry ], [ %iv.next, %loop ]
+  %iv.next = add i32 %iv, 1
+  %a = load i32, i32* %p
+  %invariant_cond = icmp ne i32 %a, 100
+  call void (i1, ...) @llvm.experimental.guard(i1 %invariant_cond) [ "deopt"() ]
+  %loop_cond = icmp slt i32 %iv.next, 1000
+  br i1 %loop_cond, label %loop, label %exit
+
+exit:
+  ret void
+}
+
+
 declare void @may_throw() inaccessiblememonly
 
 ; Test that we can sink a mustexecute load from loop header even in presence of
 ; throwing instructions after it.
 define void @test_hoist_from_header_01(i32* %p, i32 %n) {
 
 ; CHECK-LABEL: @test_hoist_from_header_01(
 ; CHECK:       entry: