vendor/lldb/lldb-trunk-r338150

7 files changed, 65 insertions, 65 deletions

diff --git a/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py b/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
index f0bc12ce98326..593911b15dd2d 100644
--- a/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
+++ b/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
@@ -31,7 +31,7 @@ class NamespaceBreakpointTestCase(TestBase):
             "A::func(int)"]
 
         # Create a target by the debugger.
-        exe = os.path.join(os.getcwd(), "a.out")
+        exe = self.getBuildArtifact("a.out")
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)
         module_list = lldb.SBFileSpecList()
@@ -48,6 +48,7 @@ class NamespaceBreakpointTestCase(TestBase):
                 "make sure breakpoint locations are correct for 'func' with eFunctionNameTypeAuto")
 
     @expectedFailureAll(bugnumber="llvm.org/pr28548", compiler="gcc")
+    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24489")
     def test_breakpoints_func_full(self):
         """Test that we can set breakpoints correctly by fullname to find all functions whose fully qualified name is "func"
            (no namespaces)."""
@@ -56,7 +57,7 @@ class NamespaceBreakpointTestCase(TestBase):
         names = ["func()", "func(int)"]
 
         # Create a target by the debugger.
-        exe = os.path.join(os.getcwd(), "a.out")
+        exe = self.getBuildArtifact("a.out")
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)
         module_list = lldb.SBFileSpecList()
@@ -81,7 +82,7 @@ class NamespaceBreakpointTestCase(TestBase):
         names = ["A::func()", "A::func(int)"]
 
         # Create a target by the debugger.
-        exe = os.path.join(os.getcwd(), "a.out")
+        exe = self.getBuildArtifact("a.out")
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)
         module_list = lldb.SBFileSpecList()
@@ -132,7 +133,7 @@ class NamespaceTestCase(TestBase):
     def test_with_run_command(self):
         """Test that anonymous and named namespace variables display correctly."""
         self.build()
-        self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
             self,
diff --git a/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py b/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py
index 18e45d9798aec..2837cfd9244e0 100644
--- a/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py
+++ b/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py
@@ -50,7 +50,7 @@ class NamespaceLookupTestCase(TestBase):
     def test_scope_lookup_with_run_command(self):
         """Test scope lookup of functions in lldb."""
         self.build()
-        self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
             self,
@@ -151,7 +151,7 @@ class NamespaceLookupTestCase(TestBase):
     def test_function_scope_lookup_with_run_command(self):
         """Test scope lookup of functions in lldb."""
         self.build()
-        self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
             self,
@@ -188,7 +188,7 @@ class NamespaceLookupTestCase(TestBase):
     def test_file_scope_lookup_with_run_command(self):
         """Test file scope lookup in lldb."""
         self.build()
-        self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
             self,
@@ -208,7 +208,7 @@ class NamespaceLookupTestCase(TestBase):
     def test_scope_lookup_before_using_with_run_command(self):
         """Test scope lookup before using in lldb."""
         self.build()
-        self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
             self,
@@ -238,7 +238,7 @@ class NamespaceLookupTestCase(TestBase):
     def test_scope_after_using_directive_lookup_with_run_command(self):
         """Test scope lookup after using directive in lldb."""
         self.build()
-        self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
             self,
@@ -260,7 +260,7 @@ class NamespaceLookupTestCase(TestBase):
     def test_scope_after_using_declaration_lookup_with_run_command(self):
         """Test scope lookup after using declaration in lldb."""
         self.build()
-        self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
             self,
@@ -279,7 +279,7 @@ class NamespaceLookupTestCase(TestBase):
     def test_scope_ambiguity_after_using_lookup_with_run_command(self):
         """Test scope lookup ambiguity after using in lldb."""
         self.build()
-        self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
             self,
@@ -305,7 +305,7 @@ class NamespaceLookupTestCase(TestBase):
     def test_scope_lookup_shadowed_by_using_with_run_command(self):
         """Test scope lookup shadowed by using in lldb."""
         self.build()
-        self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
+        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
 
         lldbutil.run_break_set_by_file_and_line(
             self,
diff --git a/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp b/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp
index 560ec40f4733b..9f5eb06cccd43 100644
--- a/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp
+++ b/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp
@@ -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++)
diff --git a/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp b/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp
index 9e5637d02b4b1..bb7731cf87b81 100644
--- a/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp
+++ b/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.cpp
@@ -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
 }
diff --git a/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h b/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h
index a07b600efa306..a0f9be88216a2 100644
--- a/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h
+++ b/packages/Python/lldbsuite/test/lang/cpp/namespace/ns.h
@@ -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
diff --git a/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp b/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp
index 04046ad9b7f4d..0051d478395db 100644
--- a/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp
+++ b/packages/Python/lldbsuite/test/lang/cpp/namespace/ns2.cpp
@@ -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
 }
diff --git a/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp b/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp
index 10b0df784225b..205e1931f3e05 100644
--- a/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp
+++ b/packages/Python/lldbsuite/test/lang/cpp/namespace/ns3.cpp
@@ -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
 }