Index: llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInteger.td
===================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInteger.td
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInteger.td
@@ -20,7 +20,7 @@
 defm REM_S : BinaryInt<srem>;
 defm REM_U : BinaryInt<urem>;
 defm AND : BinaryInt<and>;
-defm IOR : BinaryInt<or>;
+defm OR : BinaryInt<or>;
 defm XOR : BinaryInt<xor>;
 defm SHL : BinaryInt<shl>;
 defm SHR_U : BinaryInt<srl>;
Index: llvm/trunk/test/CodeGen/WebAssembly/comparisons_f32.ll
===================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/comparisons_f32.ll
+++ llvm/trunk/test/CodeGen/WebAssembly/comparisons_f32.ll
@@ -41,7 +41,7 @@
 ; CHECK-NEXT: set_local 4, pop{{$}}
 ; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}}
 ; CHECK-NEXT: set_local 5, pop{{$}}
-; CHECK-NEXT: ior (get_local 5), (get_local 4){{$}}
+; CHECK-NEXT: or (get_local 5), (get_local 4){{$}}
 ; CHECK-NEXT: set_local 6, pop{{$}}
 ; CHECK-NEXT: return (get_local 6){{$}}
 define i32 @uno_f32(float %x, float %y) {
@@ -130,9 +130,9 @@
 ; CHECK-NEXT: set_local 5, pop{{$}}
 ; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}}
 ; CHECK-NEXT: set_local 6, pop{{$}}
-; CHECK-NEXT: ior (get_local 6), (get_local 5){{$}}
+; CHECK-NEXT: or (get_local 6), (get_local 5){{$}}
 ; CHECK-NEXT: set_local 7, pop{{$}}
-; CHECK-NEXT: ior (get_local 4), (get_local 7){{$}}
+; CHECK-NEXT: or (get_local 4), (get_local 7){{$}}
 ; CHECK-NEXT: set_local 8, pop{{$}}
 ; CHECK-NEXT: return (get_local 8){{$}}
 define i32 @ueq_f32(float %x, float %y) {
Index: llvm/trunk/test/CodeGen/WebAssembly/comparisons_f64.ll
===================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/comparisons_f64.ll
+++ llvm/trunk/test/CodeGen/WebAssembly/comparisons_f64.ll
@@ -41,7 +41,7 @@
 ; CHECK-NEXT: set_local 4, pop{{$}}
 ; CHECK-NEXT: ne (get_local 2), (get_local 2){{$}}
 ; CHECK-NEXT: set_local 5, pop{{$}}
-; CHECK-NEXT: ior (get_local 5), (get_local 4){{$}}
+; CHECK-NEXT: or (get_local 5), (get_local 4){{$}}
 ; CHECK-NEXT: set_local 6, pop{{$}}
 ; CHECK-NEXT: return (get_local 6){{$}}
 define i32 @uno_f64(double %x, double %y) {
@@ -130,9 +130,9 @@
 ; CHECK-NEXT: set_local 5, pop{{$}}
 ; CHECK-NEXT: ne (get_local 3), (get_local 3){{$}}
 ; CHECK-NEXT: set_local 6, pop{{$}}
-; CHECK-NEXT: ior (get_local 6), (get_local 5){{$}}
+; CHECK-NEXT: or (get_local 6), (get_local 5){{$}}
 ; CHECK-NEXT: set_local 7, pop{{$}}
-; CHECK-NEXT: ior (get_local 4), (get_local 7){{$}}
+; CHECK-NEXT: or (get_local 4), (get_local 7){{$}}
 ; CHECK-NEXT: set_local 8, pop{{$}}
 ; CHECK-NEXT: return (get_local 8){{$}}
 define i32 @ueq_f64(double %x, double %y) {
Index: llvm/trunk/test/CodeGen/WebAssembly/i32.ll
===================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/i32.ll
+++ llvm/trunk/test/CodeGen/WebAssembly/i32.ll
@@ -145,7 +145,7 @@
   ret i32 %a
 }
 
-; CHECK-LABEL: ior32:
+; CHECK-LABEL: or32:
 ; CHECK-NEXT: .param i32{{$}}
 ; CHECK-NEXT: .param i32{{$}}
 ; CHECK-NEXT: .result i32{{$}}
@@ -154,10 +154,10 @@
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: get_local 0{{$}}
 ; CHECK-NEXT: set_local 3, pop{{$}}
-; CHECK-NEXT: ior (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: or (get_local 3), (get_local 2){{$}}
 ; CHECK-NEXT: set_local 4, pop{{$}}
 ; CHECK-NEXT: return (get_local 4){{$}}
-define i32 @ior32(i32 %x, i32 %y) {
+define i32 @or32(i32 %x, i32 %y) {
   %a = or i32 %x, %y
   ret i32 %a
 }
Index: llvm/trunk/test/CodeGen/WebAssembly/i64.ll
===================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/i64.ll
+++ llvm/trunk/test/CodeGen/WebAssembly/i64.ll
@@ -145,7 +145,7 @@
   ret i64 %a
 }
 
-; CHECK-LABEL: ior64:
+; CHECK-LABEL: or64:
 ; CHECK-NEXT: .param i64{{$}}
 ; CHECK-NEXT: .param i64{{$}}
 ; CHECK-NEXT: .result i64{{$}}
@@ -154,10 +154,10 @@
 ; CHECK-NEXT: set_local 2, pop{{$}}
 ; CHECK-NEXT: get_local 0{{$}}
 ; CHECK-NEXT: set_local 3, pop{{$}}
-; CHECK-NEXT: ior (get_local 3), (get_local 2){{$}}
+; CHECK-NEXT: or (get_local 3), (get_local 2){{$}}
 ; CHECK-NEXT: set_local 4, pop{{$}}
 ; CHECK-NEXT: return (get_local 4){{$}}
-define i64 @ior64(i64 %x, i64 %y) {
+define i64 @or64(i64 %x, i64 %y) {
   %a = or i64 %x, %y
   ret i64 %a
 }