From 005daf1bc6aabef451f92fcbdb46e0c62b866e4d Mon Sep 17 00:00:00 2001 From: "Ariel J. Bernal" Date: Fri, 5 Apr 2013 20:32:36 +0000 Subject: Fix UseNullptr fails to replace explict casts surrounded by another implicit cast UseNullptr previously matched the implicit cast to const pointer as well as the explicit cast within that has an implicit cast to nullptr as a descendant. -Refactored UseNullptr to avoid special-casing certain kinds of cast sequences -Added test cases. llvm-svn: 178907 --- .../test/cpp11-migrate/UseNullptr/basic.cpp | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'clang-tools-extra/test/cpp11-migrate/UseNullptr/basic.cpp') diff --git a/clang-tools-extra/test/cpp11-migrate/UseNullptr/basic.cpp b/clang-tools-extra/test/cpp11-migrate/UseNullptr/basic.cpp index c84758e1cd2..b7c5d5e3516 100644 --- a/clang-tools-extra/test/cpp11-migrate/UseNullptr/basic.cpp +++ b/clang-tools-extra/test/cpp11-migrate/UseNullptr/basic.cpp @@ -221,6 +221,8 @@ struct Bam { void ambiguous_function(int *a) {} void ambiguous_function(float *a) {} +void const_ambiguous_function(const int *p) {} +void const_ambiguous_function(const float *p) {} void test_explicit_cast_ambiguous1() { ambiguous_function((int*)0); @@ -251,3 +253,26 @@ void test_explicit_cast_ambiguous5() { k = (int*)0; // CHECK: k = (int*)nullptr; } + +void test_const_pointers_abiguous() { + const_ambiguous_function((int*)0); + // CHECK: const_ambiguous_function((int*)nullptr); +} + +// Test where the implicit cast to null is surrounded by another implict cast +// with possible explict casts in-between. +void test_const_pointers() { + const int *const_p1 = 0; + // CHECK: const int *const_p1 = nullptr; + const int *const_p2 = NULL; + // CHECK: const int *const_p2 = nullptr; + const int *const_p3 = (int)0; + // CHECK: const int *const_p3 = nullptr; + const int *const_p4 = (int)0.0f; + // CHECK: const int *const_p4 = nullptr; + const int *const_p5 = (int*)0; + // CHECK: const int *const_p5 = (int*)nullptr; + int *t; + const int *const_p6 = static_cast(t ? t : static_cast(0)); + // CHECK: const int *const_p6 = static_cast(t ? t : static_cast(nullptr)); +} -- cgit v1.2.3