diff options
4 files changed, 4 insertions, 4 deletions
diff --git a/clang/bindings/python/tests/cindex/test_diagnostics.py b/clang/bindings/python/tests/cindex/test_diagnostics.py index c17d5b28efe..52928db7303 100644 --- a/clang/bindings/python/tests/cindex/test_diagnostics.py +++ b/clang/bindings/python/tests/cindex/test_diagnostics.py @@ -20,7 +20,7 @@ class TestDiagnostics(unittest.TestCase): self.assertEqual(tu.diagnostics[0].location.line, 1) self.assertEqual(tu.diagnostics[0].location.column, 11) self.assertEqual(tu.diagnostics[0].spelling, - 'control reaches end of non-void function') + 'non-void function does not return a value') def test_diagnostic_note(self): # FIXME: We aren't getting notes here for some reason. diff --git a/clang/test/Analysis/nil-receiver-undefined-larger-than-voidptr-ret.m b/clang/test/Analysis/nil-receiver-undefined-larger-than-voidptr-ret.m index d4a478d327e..9685fa00a02 100644 --- a/clang/test/Analysis/nil-receiver-undefined-larger-than-voidptr-ret.m +++ b/clang/test/Analysis/nil-receiver-undefined-larger-than-voidptr-ret.m @@ -80,7 +80,7 @@ int handleVoidInComma() { return [obj voidM], 0; } -int marker(void) { // control reaches end of non-void function +int marker(void) { // non-void function does not return a value } // CHECK-darwin8: warning: The receiver of message 'longDoubleM' is nil and returns a value of type 'long double' that will be garbage diff --git a/clang/test/CodeGenObjCXX/property-dot-reference.mm b/clang/test/CodeGenObjCXX/property-dot-reference.mm index 8f3b29da47c..37840eac5f8 100644 --- a/clang/test/CodeGenObjCXX/property-dot-reference.mm +++ b/clang/test/CodeGenObjCXX/property-dot-reference.mm @@ -14,7 +14,7 @@ void GetURL() const; // CHECK: call dereferenceable({{[0-9]+}}) %struct.TFENode* bitcast (i8* (i8*, i8*, ...)* @objc_msgSend // CHECK-NEXT: call void @_ZNK7TFENode6GetURLEv(%struct.TFENode* %{{.*}}) self.node.GetURL(); -} // expected-warning {{control reaches end of non-void function}} +} // expected-warning {{non-void function does not return a value}} @end // rdar://8437240 diff --git a/clang/test/Frontend/ast-main.cpp b/clang/test/Frontend/ast-main.cpp index 89fd5e5a638..e6e2825bb33 100644 --- a/clang/test/Frontend/ast-main.cpp +++ b/clang/test/Frontend/ast-main.cpp @@ -10,7 +10,7 @@ struct S { }; template<typename T> T *S<T>::mf() { - // warning: control reaches end of non-void function [-Wreturn-type] + // warning: non-void function does not return a value [-Wreturn-type] } void f() { |
