Fix handling of the volatile bit of loads/stores in PNaCl bitcode files.

Fixes so that the volatile bit is no longer put into the bitcode file,
since the volatile bit is not in the PNaCl ABI.

BUG= https://code.google.com/p/nativeclient/issues/detail?id=3610
R=jvoung@chromium.org

Review URL: https://codereview.chromium.org/21949006

2 files changed, 15 insertions, 15 deletions

diff --git a/test/NaCl/Bitcode/bitcast-elide.ll b/test/NaCl/Bitcode/bitcast-elide.ll
index 37c19fb94c..baacfde558 100644
--- a/test/NaCl/Bitcode/bitcast-elide.ll
+++ b/test/NaCl/Bitcode/bitcast-elide.ll
@@ -45,7 +45,7 @@ define void @SimpleLoad() {
 
 ; PF2:       <FUNCTION_BLOCK NumWords=2 BlockCodeSize=4>
 ; PF2-NEXT:    <DECLAREBLOCKS op0=1/>
-; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0 op3=0/>
+; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0/>
 ; PF2-NEXT:    <INST_RET abbrevid=8/>
 ; PF2-NEXT:  </FUNCTION_BLOCK>
 
@@ -86,7 +86,7 @@ define void @SimpleLoadAlloca() {
 ; PF2-NEXT:     <CONSTANTS_BLOCK
 ; PF2:          </CONSTANTS_BLOCK>
 ; PF2-NEXT:     <INST_ALLOCA op0=1 op1=3/>
-; PF2-NEXT:     <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0 op3=0/>
+; PF2-NEXT:     <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0/>
 ; PF2-NEXT:     <INST_RET abbrevid=8/>
 ; PF2-NEXT:   </FUNCTION_BLOCK>
 
@@ -119,7 +119,7 @@ define i32* @NonsimpleLoad(i32 %i) {
 ; PF2:       <FUNCTION_BLOCK NumWords=6 BlockCodeSize=4>
 ; PF2-NEXT:    <DECLAREBLOCKS op0=1/>
 ; PF2-NEXT:    <INST_CAST abbrevid=7 op0=2 op1=1 op2=11/>
-; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0 op3=0/>
+; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0/>
 ; PF2-NEXT:    <INST_RET abbrevid=9 op0=2/>
 ; PF2:       </FUNCTION_BLOCK>
 
@@ -163,8 +163,8 @@ define i32 @TwoLoads(i32 %i) {
 
 ; PF2:       <FUNCTION_BLOCK NumWords=7 BlockCodeSize=4>
 ; PF2-NEXT:    <DECLAREBLOCKS op0=1/>
-; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=2 op1=3 op2=0 op3=0/>
-; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=3 op1=3 op2=0 op3=0/>
+; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=2 op1=3 op2=0/>
+; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=3 op1=3 op2=0/>
 ; PF2-NEXT:    <INST_BINOP abbrevid=5 op0=2 op1=1 op2=0/>
 ; PF2-NEXT:    <INST_RET abbrevid=9 op0=1/>
 ; PF2:       </FUNCTION_BLOCK>
@@ -206,8 +206,8 @@ define i32 @TwoLoadOpt(i32 %i) {
 
 ; PF2:       <FUNCTION_BLOCK NumWords=7 BlockCodeSize=4>
 ; PF2-NEXT:    <DECLAREBLOCKS op0=1/>
-; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=2 op1=3 op2=0 op3=0/>
-; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=3 op1=3 op2=0 op3=0/>
+; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=2 op1=3 op2=0/>
+; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=3 op1=3 op2=0/>
 ; PF2-NEXT:    <INST_BINOP abbrevid=5 op0=2 op1=1 op2=0/>
 ; PF2-NEXT:    <INST_RET abbrevid=9 op0=1/>
 ; PF2:       </FUNCTION_BLOCK>
@@ -240,6 +240,6 @@ define void @SimpleStore(i32 %i) {
 
 ; PF2:        <FUNCTION_BLOCK NumWords=5 BlockCodeSize=4>
 ; PF2-NEXT:     <DECLAREBLOCKS op0=1/>
-; PF2-NEXT:     <INST_STORE abbrevid=12 op0=2 op1=1 op2=3 op3=0/>
+; PF2-NEXT:     <INST_STORE abbrevid=12 op0=2 op1=1 op2=3/>
 ; PF2-NEXT:     <INST_RET abbrevid=8/>
 ; PF2:        </FUNCTION_BLOCK>
diff --git a/test/NaCl/Bitcode/inttoptr-elide.ll b/test/NaCl/Bitcode/inttoptr-elide.ll
index 988e16ea7b..8d573c8ca5 100644
--- a/test/NaCl/Bitcode/inttoptr-elide.ll
+++ b/test/NaCl/Bitcode/inttoptr-elide.ll
@@ -43,7 +43,7 @@ define void @SimpleLoad(i32 %i) {
 
 ; PF2:       <FUNCTION_BLOCK NumWords=5 BlockCodeSize=4>
 ; PF2-NEXT:    <DECLAREBLOCKS op0=1/>
-; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0 op3=0/>
+; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0/>
 ; PF2-NEXT:    <INST_RET abbrevid=8/>
 ; PF2:       </FUNCTION_BLOCK>
 
@@ -78,7 +78,7 @@ define i32* @NonsimpleLoad(i32 %i) {
 ; PF2:       <FUNCTION_BLOCK NumWords=6 BlockCodeSize=4>
 ; PF2-NEXT:    <DECLAREBLOCKS op0=1/>
 ; PF2-NEXT:    <INST_CAST abbrevid=7 op0=1 op1=1 op2=10/>
-; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0 op3=0/>
+; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0/>
 ; PF2-NEXT:    <INST_RET abbrevid=9 op0=2/>
 ; PF2:       </FUNCTION_BLOCK>
 
@@ -125,8 +125,8 @@ define i32 @TwoLoads(i32 %i) {
 
 ; PF2:       <FUNCTION_BLOCK NumWords=7 BlockCodeSize=4>
 ; PF2-NEXT:    <DECLAREBLOCKS op0=1/>
-; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0 op3=0/>
-; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=2 op1=3 op2=0 op3=0/>
+; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0/>
+; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=2 op1=3 op2=0/>
 ; PF2-NEXT:    <INST_BINOP abbrevid=5 op0=2 op1=1 op2=0/>
 ; PF2-NEXT:    <INST_RET abbrevid=9 op0=1/>
 ; PF2:      </FUNCTION_BLOCK>
@@ -170,8 +170,8 @@ define i32 @TwoLoadOpt(i32 %i) {
 
 ; PF2:       <FUNCTION_BLOCK NumWords=7 BlockCodeSize=4>
 ; PF2-NEXT:    <DECLAREBLOCKS op0=1/>
-; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0 op3=0/>
-; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=2 op1=3 op2=0 op3=0/>
+; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=1 op1=3 op2=0/>
+; PF2-NEXT:    <INST_LOAD abbrevid=4 op0=2 op1=3 op2=0/>
 ; PF2-NEXT:    <INST_BINOP abbrevid=5 op0=2 op1=1 op2=0/>
 ; PF2-NEXT:    <INST_RET abbrevid=9 op0=1/>
 ; PF2:       </FUNCTION_BLOCK>
@@ -206,6 +206,6 @@ define void @SimpleStore(i32 %i) {
 
 ; PF2:      <FUNCTION_BLOCK NumWords=5 BlockCodeSize=4>
 ; PF2-NEXT:   <DECLAREBLOCKS op0=1/>
-; PF2-NEXT:   <INST_STORE abbrevid=12 op0=1 op1=1 op2=3 op3=0/>
+; PF2-NEXT:   <INST_STORE abbrevid=12 op0=1 op1=1 op2=3/>
 ; PF2-NEXT:   <INST_RET abbrevid=8/>
 ; PF2T:     </FUNCTION_BLOCK>