Summary: Currently there are bugs in out detection of multi-level pointer conversions and pointer to member conversions. This patch fixes the following issues. * Allow multi-level pointers with different nested qualifiers. * Allow multi-level mixed pointers to objects and pointers to members with different nested qualifiers. * Allow conversions from `int Base::*` to `int Derived::*` but only for non-nested pointers. There is still some work that needs to be done to clean this patch up but I want to get some input on it. Open questions: * Does `__pointer_to_member_type_info::can_catch(...)` need to adjust the pointer if a base to derived conversion is performed? Reviewers: danalbert, compnerd, mclow.lists Reviewed By: mclow.lists Subscribers: cfe-commits Differential Revision: http://reviews.llvm.org/D8758 llvm-svn: 233984
94 lines
1.3 KiB
C++
94 lines
1.3 KiB
C++
//===--------------------- catch_pointer_nullptr.cpp ----------------------===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is dual licensed under the MIT and the University of Illinois Open
|
|
// Source Licenses. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include <cassert>
|
|
#include <cstdlib>
|
|
|
|
#ifndef __has_feature
|
|
#define __has_feature(x) 0
|
|
#endif
|
|
|
|
struct A {};
|
|
|
|
#if __has_feature(cxx_nullptr)
|
|
|
|
void test1()
|
|
{
|
|
try
|
|
{
|
|
throw nullptr;
|
|
assert(false);
|
|
}
|
|
catch (int*)
|
|
{
|
|
}
|
|
catch (long*)
|
|
{
|
|
assert(false);
|
|
}
|
|
}
|
|
|
|
void test2()
|
|
{
|
|
try
|
|
{
|
|
throw nullptr;
|
|
assert(false);
|
|
}
|
|
catch (A*)
|
|
{
|
|
}
|
|
catch (int*)
|
|
{
|
|
assert(false);
|
|
}
|
|
}
|
|
|
|
template <class Catch>
|
|
void catch_nullptr_test() {
|
|
try {
|
|
throw nullptr;
|
|
assert(false);
|
|
} catch (Catch) {
|
|
// nothing todo
|
|
} catch (...) {
|
|
assert(false);
|
|
}
|
|
}
|
|
|
|
#else
|
|
|
|
void test1()
|
|
{
|
|
}
|
|
|
|
void test2()
|
|
{
|
|
}
|
|
|
|
template <class Catch>
|
|
void catch_nullptr_test()
|
|
{
|
|
}
|
|
|
|
#endif
|
|
|
|
int main()
|
|
{
|
|
// catch naked nullptrs
|
|
test1();
|
|
test2();
|
|
|
|
catch_nullptr_test<int*>();
|
|
catch_nullptr_test<int**>();
|
|
catch_nullptr_test<int A::*>();
|
|
catch_nullptr_test<const int A::*>();
|
|
catch_nullptr_test<int A::**>();
|
|
}
|