Index: lib/Target/AMDGPU/SIInstructions.td
===================================================================
--- lib/Target/AMDGPU/SIInstructions.td
+++ lib/Target/AMDGPU/SIInstructions.td
@@ -197,7 +197,6 @@
   let hasSideEffects = 1;
   let mayLoad = 1;
   let mayStore = 1;
-  let isBarrier = 1;
   let isConvergent = 1;
   let FixedSize = 1;
   let Size = 0;
Index: test/CodeGen/AMDGPU/llvm.amdgcn.wave.barrier.ll
===================================================================
--- test/CodeGen/AMDGPU/llvm.amdgcn.wave.barrier.ll
+++ test/CodeGen/AMDGPU/llvm.amdgcn.wave.barrier.ll
@@ -10,6 +10,18 @@
   ret void
 }
 
+; Check for verifier error from interpreting wave_barrier as a control
+; flow barrier.
+
+; GCN-LABEL: {{^}}test_wave_barrier_is_not_isBarrier:
+; GCN-DAG: ; wave barrier
+; GCN-NOT: s_barrier
+define amdgpu_kernel void @test_wave_barrier_is_not_isBarrier() #0 {
+entry:
+  call void @llvm.amdgcn.wave.barrier() #1
+  unreachable
+}
+
 declare void @llvm.amdgcn.wave.barrier() #1
 
 attributes #0 = { nounwind }