Author: labath
Date: Wed Jun 20 10:32:48 2018
New Revision: 335149
URL: http://llvm.org/viewvc/llvm-project?rev=335149&view=rev
Log:
Make test sources compatible with android+libcxx+modules
In a modules build, android is very picky about which symbols are
visible after including libc++ headers (e.g. <cstdio> defines only
std::printf and not ::printf).
This consolidates the tests where this was an issue to always include
the <c???> version of the headers and prefixes the symbols with std:: as
necessary.
Apart from that, there is no functional change in the tests.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp
lldb/trunk/packages/Python/lldbsuite/test/types/basic_type.cpp
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp?rev=335149&r1=335148&r2=335149&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp
Wed Jun 20 10:32:48 2018
@@ -20,6 +20,9 @@
#endif
+#include <cstdint>
+#include <cstdio>
+
class a_class
{
public:
@@ -79,12 +82,9 @@ typedef struct a_union_nonzero_tag {
} a_union_nonzero_t;
-#include <stdint.h>
-#include <stdio.h>
-
void Puts(char const *msg)
{
- puts(msg);
+ std::puts(msg);
}
int
@@ -124,53 +124,53 @@ main (int argc, char const *argv[])
a_union_zero_t a_union_zero_array_unbounded[] = {{ T_VALUE_1 }, {
T_VALUE_2 }};
#ifdef T_PRINTF_FORMAT
- printf ("%s: a = '" T_PRINTF_FORMAT "'\n", T_CSTR, a);
- printf ("%s*: %p => *a_ptr = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_ptr,
*a_ptr);
- printf ("%s&: @%p => a_ref = '" T_PRINTF_FORMAT "'\n", T_CSTR, &a_ref,
a_ref);
-
- printf ("%s[2]: a_array_bounded[0] = '" T_PRINTF_FORMAT "'\n", T_CSTR,
a_array_bounded[0]);
- printf ("%s[2]: a_array_bounded[1] = '" T_PRINTF_FORMAT "'\n", T_CSTR,
a_array_bounded[1]);
-
- printf ("%s[]: a_array_unbounded[0] = '" T_PRINTF_FORMAT "'\n", T_CSTR,
a_array_unbounded[0]);
- printf ("%s[]: a_array_unbounded[1] = '" T_PRINTF_FORMAT "'\n", T_CSTR,
a_array_unbounded[1]);
-
- printf ("(a_class) a_class_instance.m_a = '" T_PRINTF_FORMAT "'\n",
a_class_instance.get_a());
- printf ("(a_class) a_class_instance.m_b = '" T_PRINTF_FORMAT "'\n",
a_class_instance.get_b());
- printf ("(a_class*) a_class_ptr = %p, a_class_ptr->m_a = '"
T_PRINTF_FORMAT "'\n", a_class_ptr, a_class_ptr->get_a());
- printf ("(a_class*) a_class_ptr = %p, a_class_ptr->m_b = '"
T_PRINTF_FORMAT "'\n", a_class_ptr, a_class_ptr->get_b());
- printf ("(a_class&) a_class_ref = %p, a_class_ref.m_a = '" T_PRINTF_FORMAT
"'\n", &a_class_ref, a_class_ref.get_a());
- printf ("(a_class&) a_class_ref = %p, a_class_ref.m_b = '" T_PRINTF_FORMAT
"'\n", &a_class_ref, a_class_ref.get_b());
-
- printf ("(a_struct_t) a_struct.a = '" T_PRINTF_FORMAT "'\n", a_struct.a);
- printf ("(a_struct_t) a_struct.b = '" T_PRINTF_FORMAT "'\n", a_struct.b);
- printf ("(a_struct_t*) a_struct_ptr = %p, a_struct_ptr->a = '"
T_PRINTF_FORMAT "'\n", a_struct_ptr, a_struct_ptr->a);
- printf ("(a_struct_t*) a_struct_ptr = %p, a_struct_ptr->b = '"
T_PRINTF_FORMAT "'\n", a_struct_ptr, a_struct_ptr->b);
- printf ("(a_struct_t&) a_struct_ref = %p, a_struct_ref.a = '"
T_PRINTF_FORMAT "'\n", &a_struct_ref, a_struct_ref.a);
- printf ("(a_struct_t&) a_struct_ref = %p, a_struct_ref.b = '"
T_PRINTF_FORMAT "'\n", &a_struct_ref, a_struct_ref.b);
+ std::printf ("%s: a = '" T_PRINTF_FORMAT "'\n", T_CSTR, a);
+ std::printf ("%s*: %p => *a_ptr = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_ptr,
*a_ptr);
+ std::printf ("%s&: @%p => a_ref = '" T_PRINTF_FORMAT "'\n", T_CSTR,
&a_ref, a_ref);
+
+ std::printf ("%s[2]: a_array_bounded[0] = '" T_PRINTF_FORMAT "'\n",
T_CSTR, a_array_bounded[0]);
+ std::printf ("%s[2]: a_array_bounded[1] = '" T_PRINTF_FORMAT "'\n",
T_CSTR, a_array_bounded[1]);
+
+ std::printf ("%s[]: a_array_unbounded[0] = '" T_PRINTF_FORMAT "'\n",
T_CSTR, a_array_unbounded[0]);
+ std::printf ("%s[]: a_array_unbounded[1] = '" T_PRINTF_FORMAT "'\n",
T_CSTR, a_array_unbounded[1]);
+
+ std::printf ("(a_class) a_class_instance.m_a = '" T_PRINTF_FORMAT "'\n",
a_class_instance.get_a());
+ std::printf ("(a_class) a_class_instance.m_b = '" T_PRINTF_FORMAT "'\n",
a_class_instance.get_b());
+ std::printf ("(a_class*) a_class_ptr = %p, a_class_ptr->m_a = '"
T_PRINTF_FORMAT "'\n", a_class_ptr, a_class_ptr->get_a());
+ std::printf ("(a_class*) a_class_ptr = %p, a_class_ptr->m_b = '"
T_PRINTF_FORMAT "'\n", a_class_ptr, a_class_ptr->get_b());
+ std::printf ("(a_class&) a_class_ref = %p, a_class_ref.m_a = '"
T_PRINTF_FORMAT "'\n", &a_class_ref, a_class_ref.get_a());
+ std::printf ("(a_class&) a_class_ref = %p, a_class_ref.m_b = '"
T_PRINTF_FORMAT "'\n", &a_class_ref, a_class_ref.get_b());
+
+ std::printf ("(a_struct_t) a_struct.a = '" T_PRINTF_FORMAT "'\n",
a_struct.a);
+ std::printf ("(a_struct_t) a_struct.b = '" T_PRINTF_FORMAT "'\n",
a_struct.b);
+ std::printf ("(a_struct_t*) a_struct_ptr = %p, a_struct_ptr->a = '"
T_PRINTF_FORMAT "'\n", a_struct_ptr, a_struct_ptr->a);
+ std::printf ("(a_struct_t*) a_struct_ptr = %p, a_struct_ptr->b = '"
T_PRINTF_FORMAT "'\n", a_struct_ptr, a_struct_ptr->b);
+ std::printf ("(a_struct_t&) a_struct_ref = %p, a_struct_ref.a = '"
T_PRINTF_FORMAT "'\n", &a_struct_ref, a_struct_ref.a);
+ std::printf ("(a_struct_t&) a_struct_ref = %p, a_struct_ref.b = '"
T_PRINTF_FORMAT "'\n", &a_struct_ref, a_struct_ref.b);
- printf ("(a_union_zero_t) a_union_zero.a = '" T_PRINTF_FORMAT "'\n",
a_union_zero.a);
- printf ("(a_union_zero_t*) a_union_zero_ptr = %p, a_union_zero_ptr->a = '"
T_PRINTF_FORMAT "'\n", a_union_zero_ptr, a_union_zero_ptr->a);
- printf ("(a_union_zero_t&) a_union_zero_ref = %p, a_union_zero_ref.a = '"
T_PRINTF_FORMAT "'\n", &a_union_zero_ref, a_union_zero_ref.a);
-
- printf ("(a_union_nonzero_t) a_union_nonzero.u.a = '" T_PRINTF_FORMAT
"'\n", a_union_nonzero.u.a);
- printf ("(a_union_nonzero_t*) a_union_nonzero_ptr = %p,
a_union_nonzero_ptr->u.a = '" T_PRINTF_FORMAT "'\n", a_union_nonzero_ptr,
a_union_nonzero_ptr->u.a);
- printf ("(a_union_nonzero_t&) a_union_nonzero_ref = %p,
a_union_nonzero_ref.u.a = '" T_PRINTF_FORMAT "'\n", &a_union_nonzero_ref,
a_union_nonzero_ref.u.a);
-
- printf ("(a_struct_t[2]) a_struct_array_bounded[0].a = '" T_PRINTF_FORMAT
"'\n", a_struct_array_bounded[0].a);
- printf ("(a_struct_t[2]) a_struct_array_bounded[0].b = '" T_PRINTF_FORMAT
"'\n", a_struct_array_bounded[0].b);
- printf ("(a_struct_t[2]) a_struct_array_bounded[1].a = '" T_PRINTF_FORMAT
"'\n", a_struct_array_bounded[1].a);
- printf ("(a_struct_t[2]) a_struct_array_bounded[1].b = '" T_PRINTF_FORMAT
"'\n", a_struct_array_bounded[1].b);
-
- printf ("(a_struct_t[]) a_struct_array_unbounded[0].a = '" T_PRINTF_FORMAT
"'\n", a_struct_array_unbounded[0].a);
- printf ("(a_struct_t[]) a_struct_array_unbounded[0].b = '" T_PRINTF_FORMAT
"'\n", a_struct_array_unbounded[0].b);
- printf ("(a_struct_t[]) a_struct_array_unbounded[1].a = '" T_PRINTF_FORMAT
"'\n", a_struct_array_unbounded[1].a);
- printf ("(a_struct_t[]) a_struct_array_unbounded[1].b = '" T_PRINTF_FORMAT
"'\n", a_struct_array_unbounded[1].b);
+ std::printf ("(a_union_zero_t) a_union_zero.a = '" T_PRINTF_FORMAT "'\n",
a_union_zero.a);
+ std::printf ("(a_union_zero_t*) a_union_zero_ptr = %p, a_union_zero_ptr->a
= '" T_PRINTF_FORMAT "'\n", a_union_zero_ptr, a_union_zero_ptr->a);
+ std::printf ("(a_union_zero_t&) a_union_zero_ref = %p, a_union_zero_ref.a
= '" T_PRINTF_FORMAT "'\n", &a_union_zero_ref, a_union_zero_ref.a);
+
+ std::printf ("(a_union_nonzero_t) a_union_nonzero.u.a = '" T_PRINTF_FORMAT
"'\n", a_union_nonzero.u.a);
+ std::printf ("(a_union_nonzero_t*) a_union_nonzero_ptr = %p,
a_union_nonzero_ptr->u.a = '" T_PRINTF_FORMAT "'\n", a_union_nonzero_ptr,
a_union_nonzero_ptr->u.a);
+ std::printf ("(a_union_nonzero_t&) a_union_nonzero_ref = %p,
a_union_nonzero_ref.u.a = '" T_PRINTF_FORMAT "'\n", &a_union_nonzero_ref,
a_union_nonzero_ref.u.a);
+
+ std::printf ("(a_struct_t[2]) a_struct_array_bounded[0].a = '"
T_PRINTF_FORMAT "'\n", a_struct_array_bounded[0].a);
+ std::printf ("(a_struct_t[2]) a_struct_array_bounded[0].b = '"
T_PRINTF_FORMAT "'\n", a_struct_array_bounded[0].b);
+ std::printf ("(a_struct_t[2]) a_struct_array_bounded[1].a = '"
T_PRINTF_FORMAT "'\n", a_struct_array_bounded[1].a);
+ std::printf ("(a_struct_t[2]) a_struct_array_bounded[1].b = '"
T_PRINTF_FORMAT "'\n", a_struct_array_bounded[1].b);
+
+ std::printf ("(a_struct_t[]) a_struct_array_unbounded[0].a = '"
T_PRINTF_FORMAT "'\n", a_struct_array_unbounded[0].a);
+ std::printf ("(a_struct_t[]) a_struct_array_unbounded[0].b = '"
T_PRINTF_FORMAT "'\n", a_struct_array_unbounded[0].b);
+ std::printf ("(a_struct_t[]) a_struct_array_unbounded[1].a = '"
T_PRINTF_FORMAT "'\n", a_struct_array_unbounded[1].a);
+ std::printf ("(a_struct_t[]) a_struct_array_unbounded[1].b = '"
T_PRINTF_FORMAT "'\n", a_struct_array_unbounded[1].b);
- printf ("(a_union_zero_t[2]) a_union_zero_array_bounded[0].a = '"
T_PRINTF_FORMAT "'\n", a_union_zero_array_bounded[0].a);
- printf ("(a_union_zero_t[2]) a_union_zero_array_bounded[1].a = '"
T_PRINTF_FORMAT "'\n", a_union_zero_array_bounded[1].a);
+ std::printf ("(a_union_zero_t[2]) a_union_zero_array_bounded[0].a = '"
T_PRINTF_FORMAT "'\n", a_union_zero_array_bounded[0].a);
+ std::printf ("(a_union_zero_t[2]) a_union_zero_array_bounded[1].a = '"
T_PRINTF_FORMAT "'\n", a_union_zero_array_bounded[1].a);
- printf ("(a_union_zero_t[]) a_union_zero_array_unbounded[0].a = '"
T_PRINTF_FORMAT "'\n", a_union_zero_array_unbounded[0].a);
- printf ("(a_union_zero_t[]) a_union_zero_array_unbounded[1].a = '"
T_PRINTF_FORMAT "'\n", a_union_zero_array_unbounded[1].a);
+ std::printf ("(a_union_zero_t[]) a_union_zero_array_unbounded[0].a = '"
T_PRINTF_FORMAT "'\n", a_union_zero_array_unbounded[0].a);
+ std::printf ("(a_union_zero_t[]) a_union_zero_array_unbounded[1].a = '"
T_PRINTF_FORMAT "'\n", a_union_zero_array_unbounded[1].a);
#endif
Puts("About to exit, break here to check values..."); // Set break point
at this line.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp?rev=335149&r1=335148&r2=335149&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp
(original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp Wed
Jun 20 10:32:48 2018
@@ -90,7 +90,7 @@ public:
B(ai, bi),
m_c_int(ci)
{
- printf("Within C::ctor() m_c_int=%d\n", m_c_int); // Set break point
at this line.
+ std::printf("Within C::ctor() m_c_int=%d\n", m_c_int); // Set break
point at this line.
}
//virtual
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp?rev=335149&r1=335148&r2=335149&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp
(original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp Wed
Jun 20 10:32:48 2018
@@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
#include <cstdarg>
+#include <cstdlib>
#include "ns.h"
namespace {
@@ -23,7 +24,7 @@ namespace {
variadic_sum (int arg_count...)
{
int sum = 0;
- va_list args;
+ std::va_list args;
va_start(args, arg_count);
for (int i = 0; i < arg_count; i++)
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp?rev=335149&r1=335148&r2=335149&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp
(original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp Wed Jun
20 10:32:48 2018
@@ -11,22 +11,22 @@
int foo()
{
- printf("global foo()\n");
- return 42;
+ std::printf("global foo()\n");
+ return 42;
}
int func()
{
- printf("global func()\n");
- return 1;
+ std::printf("global func()\n");
+ return 1;
}
int func(int a)
{
- printf("global func(int)\n");
- return a + 1;
+ std::printf("global func(int)\n");
+ return a + 1;
}
void test_lookup_at_global_scope()
{
- // BP_global_scope
- printf("at global scope: foo() = %d\n", foo()); // eval foo(), exp: 42
- printf("at global scope: func() = %d\n", func()); // eval func(), exp: 1
+ // BP_global_scope
+ std::printf("at global scope: foo() = %d\n", foo()); // eval foo(), exp: 42
+ std::printf("at global scope: func() = %d\n", func()); // eval func(), exp: 1
}
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h?rev=335149&r1=335148&r2=335149&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h Wed Jun
20 10:32:48 2018
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include <stdio.h>
+#include <cstdio>
void test_lookup_at_global_scope();
void test_lookup_at_file_scope();
@@ -15,22 +15,20 @@ void test_lookup_before_using_directive(
void test_lookup_after_using_directive();
int func(int a);
namespace A {
- int foo();
- int func(int a);
- inline int func()
- {
- printf("A::func()\n");
- return 3;
- }
- inline int func2()
- {
- printf("A::func2()\n");
- return 3;
- }
- void test_lookup_at_ns_scope();
- namespace B {
- int func();
- void test_lookup_at_nested_ns_scope();
- void test_lookup_at_nested_ns_scope_after_using();
- }
+int foo();
+int func(int a);
+inline int func() {
+ std::printf("A::func()\n");
+ return 3;
+}
+inline int func2() {
+ std::printf("A::func2()\n");
+ return 3;
}
+void test_lookup_at_ns_scope();
+namespace B {
+int func();
+void test_lookup_at_nested_ns_scope();
+void test_lookup_at_nested_ns_scope_after_using();
+} // namespace B
+} // namespace A
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp?rev=335149&r1=335148&r2=335149&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp
(original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp Wed
Jun 20 10:32:48 2018
@@ -11,26 +11,26 @@
static int func()
{
- printf("static m2.cpp func()\n");
- return 2;
+ std::printf("static m2.cpp func()\n");
+ return 2;
}
void test_lookup_at_file_scope()
{
- // BP_file_scope
- printf("at file scope: func() = %d\n", func()); // eval func(), exp: 2
- printf("at file scope: func(10) = %d\n", func(10)); // eval func(10), exp:
11
+ // BP_file_scope
+ std::printf("at file scope: func() = %d\n", func()); // eval func(), exp: 2
+ std::printf("at file scope: func(10) = %d\n", func(10)); // eval func(10),
exp: 11
}
namespace A {
namespace B {
int func()
{
- printf("A::B::func()\n");
- return 4;
+ std::printf("A::B::func()\n");
+ return 4;
}
void test_lookup_at_nested_ns_scope()
{
// BP_nested_ns_scope
- printf("at nested ns scope: func() = %d\n", func()); // eval
func(), exp: 4
+ std::printf("at nested ns scope: func() = %d\n", func()); // eval
func(), exp: 4
//printf("func(10) = %d\n", func(10)); // eval func(10), exp: 13
// NOTE: Under the rules of C++, this test would normally get an
error
@@ -42,24 +42,24 @@ namespace A {
{
// BP_nested_ns_scope_after_using
using A::func;
- printf("at nested ns scope after using: func() = %d\n", func());
// eval func(), exp: 3
+ std::printf("at nested ns scope after using: func() = %d\n",
func()); // eval func(), exp: 3
}
}
}
int A::foo()
{
- printf("A::foo()\n");
- return 42;
+ std::printf("A::foo()\n");
+ return 42;
}
int A::func(int a)
{
- printf("A::func(int)\n");
- return a + 3;
+ std::printf("A::func(int)\n");
+ return a + 3;
}
void A::test_lookup_at_ns_scope()
{
- // BP_ns_scope
- printf("at nested ns scope: func() = %d\n", func()); // eval func(), exp: 3
- printf("at nested ns scope: func(10) = %d\n", func(10)); // eval func(10),
exp: 13
- printf("at nested ns scope: foo() = %d\n", foo()); // eval foo(), exp: 42
+ // BP_ns_scope
+ std::printf("at nested ns scope: func() = %d\n", func()); // eval func(),
exp: 3
+ std::printf("at nested ns scope: func(10) = %d\n", func(10)); // eval
func(10), exp: 13
+ std::printf("at nested ns scope: foo() = %d\n", foo()); // eval foo(), exp:
42
}
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp?rev=335149&r1=335148&r2=335149&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp
(original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp Wed
Jun 20 10:32:48 2018
@@ -13,15 +13,15 @@ extern int func();
// Note: the following function must be before the using.
void test_lookup_before_using_directive()
{
- // BP_before_using_directive
- printf("before using directive: func() = %d\n", func()); // eval func(),
exp: 1
+ // BP_before_using_directive
+ std::printf("before using directive: func() = %d\n", func()); // eval
func(), exp: 1
}
using namespace A;
void test_lookup_after_using_directive()
{
- // BP_after_using_directive
- //printf("func() = %d\n", func()); // eval func(), exp: error, amiguous
- printf("after using directive: func2() = %d\n", func2()); // eval func2(),
exp: 3
- printf("after using directive: ::func() = %d\n", ::func()); // eval
::func(), exp: 1
- printf("after using directive: B::func() = %d\n", B::func()); // eval
B::func(), exp: 4
+ // BP_after_using_directive
+ //printf("func() = %d\n", func()); // eval func(), exp: error, amiguous
+ std::printf("after using directive: func2() = %d\n", func2()); // eval
func2(), exp: 3
+ std::printf("after using directive: ::func() = %d\n", ::func()); // eval
::func(), exp: 1
+ std::printf("after using directive: B::func() = %d\n", B::func()); // eval
B::func(), exp: 4
}
Modified: lldb/trunk/packages/Python/lldbsuite/test/types/basic_type.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/types/basic_type.cpp?rev=335149&r1=335148&r2=335149&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/types/basic_type.cpp (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/types/basic_type.cpp Wed Jun 20
10:32:48 2018
@@ -23,6 +23,9 @@
#ifdef TEST_BLOCK_CAPTURED_VARS
#include <dispatch/dispatch.h>
#endif
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
class a_class
{
@@ -83,9 +86,6 @@ typedef struct a_union_nonzero_tag {
} a_union_nonzero_t;
-#include <stdint.h>
-#include <stdio.h>
-
int
main (int argc, char const *argv[])
{
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
