diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 01317de..badd64c 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1587,8 +1587,9 @@
 def err_goto_into_protected_scope : Error<"illegal goto into protected scope">;
 def err_switch_into_protected_scope : Error<
   "illegal switch case into protected scope">;
-def err_indirect_goto_in_protected_scope : Error<
-  "illegal indirect goto in protected scope, unknown effect on scopes">;
+def err_indirect_goto_in_protected_scope : Warning<
+  "illegal indirect goto in protected scope, unknown effect on scopes">,
+    InGroup<DiagGroup<"label-address-scope">>;
 def err_addr_of_label_in_protected_scope : Warning<
   "address taken of label in protected scope, jump to it would have "
   "unknown effect on scope">, InGroup<DiagGroup<"label-address-scope">>;
diff --git a/test/Sema/scope-check.c b/test/Sema/scope-check.c
index 1df0186..6f86402 100644
--- a/test/Sema/scope-check.c
+++ b/test/Sema/scope-check.c
@@ -140,7 +140,7 @@
 
 L3:
 L4:  
-  goto *P;  // expected-error {{illegal indirect goto in protected scope, unknown effect on scopes}}
+  goto *P;  // expected-warning {{illegal indirect goto in protected scope, unknown effect on scopes}}
   goto L3;  // ok
   goto L4;  // ok