pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lldb: don't try to pass non-trivial type through variadic function



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Wed Feb 24 01:44:29 2016 +0100
Changeset:	3159fc442184bf906672f88640d936a6ed1611ba

Modified Files:
	lldb-git/distinfo
	lldb/distinfo
Added Files:
	lldb-git/patches/patch-tools_lldb-mi_MICmnBase.cpp
	lldb-git/patches/patch-tools_lldb-mi_MICmnBase.h
	lldb-git/patches/patch-tools_lldb-mi_MIDriver.cpp
	lldb-git/patches/patch-tools_lldb-mi_MIUtilString.cpp
	lldb-git/patches/patch-tools_lldb-mi_MIUtilString.h
	lldb/patches/patch-tools_lldb-mi_MICmnBase.cpp
	lldb/patches/patch-tools_lldb-mi_MICmnBase.h
	lldb/patches/patch-tools_lldb-mi_MIDriver.cpp
	lldb/patches/patch-tools_lldb-mi_MIUtilString.cpp
	lldb/patches/patch-tools_lldb-mi_MIUtilString.h

Log Message:
lldb: don't try to pass non-trivial type through variadic function

It is not permitted. XXX should be upstreamed?

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3159fc442184bf906672f88640d936a6ed1611ba

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 lldb-git/distinfo                                     |  5 +++++
 lldb-git/patches/patch-tools_lldb-mi_MICmnBase.cpp    | 16 ++++++++++++++++
 lldb-git/patches/patch-tools_lldb-mi_MICmnBase.h      | 16 ++++++++++++++++
 lldb-git/patches/patch-tools_lldb-mi_MIDriver.cpp     | 16 ++++++++++++++++
 lldb-git/patches/patch-tools_lldb-mi_MIUtilString.cpp | 16 ++++++++++++++++
 lldb-git/patches/patch-tools_lldb-mi_MIUtilString.h   | 16 ++++++++++++++++
 lldb/distinfo                                         |  5 +++++
 lldb/patches/patch-tools_lldb-mi_MICmnBase.cpp        | 16 ++++++++++++++++
 lldb/patches/patch-tools_lldb-mi_MICmnBase.h          | 16 ++++++++++++++++
 lldb/patches/patch-tools_lldb-mi_MIDriver.cpp         | 16 ++++++++++++++++
 lldb/patches/patch-tools_lldb-mi_MIUtilString.cpp     | 16 ++++++++++++++++
 lldb/patches/patch-tools_lldb-mi_MIUtilString.h       | 16 ++++++++++++++++
 12 files changed, 170 insertions(+)

diffs:
diff --git a/lldb-git/distinfo b/lldb-git/distinfo
index 049ddb3..8d28ee2 100644
--- a/lldb-git/distinfo
+++ b/lldb-git/distinfo
@@ -26,4 +26,9 @@ SHA1 (patch-source_Utility_regerror.c) = 6bbf8dc3f12e64515d166a475452f3f08d849ad
 SHA1 (patch-source_Utility_regexec.c) = 6e523b4d00d74fb51d5971d415fd3d0a8323461b
 SHA1 (patch-source_Utility_regfree.c) = a3033a951c2773b5fd1209ee2a60be2e042970ee
 SHA1 (patch-source_Utility_regstrlcpy.c) = 284dc5d06d88e243fb91a1225008319b282d6fdc
+SHA1 (patch-tools_lldb-mi_MICmnBase.cpp) = c673fa0c89c509a3c6acad1d5b154396cacb9bb2
+SHA1 (patch-tools_lldb-mi_MICmnBase.h) = b5cb72e6d22a4e06feb81107b718466476346171
+SHA1 (patch-tools_lldb-mi_MIDriver.cpp) = 14c529a92d37a4a83221013e49b6ed18ef404e3b
 SHA1 (patch-tools_lldb-mi_MIUtilParse.h) = cbd524e70c10cee25e44f1befe594a7198b008b9
+SHA1 (patch-tools_lldb-mi_MIUtilString.cpp) = fb6266ce614eec8a4836fd02a34d5a2ea94c7480
+SHA1 (patch-tools_lldb-mi_MIUtilString.h) = 34419e7f3bfccb6f669ae3075a5a27dd1064d202
diff --git a/lldb-git/patches/patch-tools_lldb-mi_MICmnBase.cpp b/lldb-git/patches/patch-tools_lldb-mi_MICmnBase.cpp
new file mode 100644
index 0000000..c0fb711
--- /dev/null
+++ b/lldb-git/patches/patch-tools_lldb-mi_MICmnBase.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Cannot pass object of non-trivial type 'const CMIUtilString'
+through variadic function.
+
+--- tools/lldb-mi/MICmnBase.cpp.orig	2016-02-21 02:08:07.000000000 +0000
++++ tools/lldb-mi/MICmnBase.cpp
+@@ -127,7 +127,7 @@ CMICmnBase::ClrErrorDescription() const
+ // Throws:  None.
+ //--
+ void
+-CMICmnBase::SetErrorDescriptionn(const CMIUtilString vFormat, ...) const
++CMICmnBase::SetErrorDescriptionn(const char *vFormat, ...) const
+ {
+     va_list args;
+     va_start(args, vFormat);
diff --git a/lldb-git/patches/patch-tools_lldb-mi_MICmnBase.h b/lldb-git/patches/patch-tools_lldb-mi_MICmnBase.h
new file mode 100644
index 0000000..31bd0ef
--- /dev/null
+++ b/lldb-git/patches/patch-tools_lldb-mi_MICmnBase.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Cannot pass object of non-trivial type 'const CMIUtilString'
+through variadic function.
+
+--- tools/lldb-mi/MICmnBase.h.orig	2016-02-21 02:08:07.000000000 +0000
++++ tools/lldb-mi/MICmnBase.h
+@@ -28,7 +28,7 @@ class CMICmnBase
+     bool HaveErrorDescription() const;
+     const CMIUtilString &GetErrorDescription() const;
+     void SetErrorDescription(const CMIUtilString &vrTxt) const;
+-    void SetErrorDescriptionn(const CMIUtilString vFormat, ...) const;
++    void SetErrorDescriptionn(const char *vFormat, ...) const;
+     void SetErrorDescriptionNoLog(const CMIUtilString &vrTxt) const;
+     void ClrErrorDescription() const;
+ 
diff --git a/lldb-git/patches/patch-tools_lldb-mi_MIDriver.cpp b/lldb-git/patches/patch-tools_lldb-mi_MIDriver.cpp
new file mode 100644
index 0000000..f447e14
--- /dev/null
+++ b/lldb-git/patches/patch-tools_lldb-mi_MIDriver.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Cannot pass object of non-trivial type 'const CMIUtilString'
+through variadic function.
+
+--- tools/lldb-mi/MIDriver.cpp.orig	2016-02-21 02:08:07.000000000 +0000
++++ tools/lldb-mi/MIDriver.cpp
+@@ -491,7 +491,7 @@ CMIDriver::StartWorkerThreads()
+     {
+         const CMIUtilString errMsg = CMIUtilString::Format(MIRSRC(IDS_THREADMGR_ERR_THREAD_FAIL_CREATE),
+                                                            CMICmnThreadMgrStd::Instance().GetErrorDescription().c_str());
+-        SetErrorDescriptionn(errMsg);
++        SetErrorDescriptionn(errMsg.c_str());
+         return MIstatus::failure;
+     }
+ 
diff --git a/lldb-git/patches/patch-tools_lldb-mi_MIUtilString.cpp b/lldb-git/patches/patch-tools_lldb-mi_MIUtilString.cpp
new file mode 100644
index 0000000..4c6889e
--- /dev/null
+++ b/lldb-git/patches/patch-tools_lldb-mi_MIUtilString.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Cannot pass object of non-trivial type 'const CMIUtilString'
+through variadic function.
+
+--- tools/lldb-mi/MIUtilString.cpp.orig	2016-02-21 02:08:07.000000000 +0000
++++ tools/lldb-mi/MIUtilString.cpp
+@@ -159,7 +159,7 @@ CMIUtilString::FormatPriv(const CMIUtilS
+ // Throws:  None.
+ //--
+ CMIUtilString
+-CMIUtilString::Format(const CMIUtilString vFormating, ...)
++CMIUtilString::Format(const char* vFormating, ...)
+ {
+     va_list args;
+     va_start(args, vFormating);
diff --git a/lldb-git/patches/patch-tools_lldb-mi_MIUtilString.h b/lldb-git/patches/patch-tools_lldb-mi_MIUtilString.h
new file mode 100644
index 0000000..6b823b0
--- /dev/null
+++ b/lldb-git/patches/patch-tools_lldb-mi_MIUtilString.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Cannot pass object of non-trivial type 'const CMIUtilString'
+through variadic function.
+
+--- tools/lldb-mi/MIUtilString.h.orig	2016-02-21 02:08:07.000000000 +0000
++++ tools/lldb-mi/MIUtilString.h
+@@ -30,7 +30,7 @@ class CMIUtilString : public std::string
+ 
+     // Static method:
+   public:
+-    static CMIUtilString Format(const CMIUtilString vFormating, ...);
++    static CMIUtilString Format(const char *vFormating, ...);
+     static CMIUtilString FormatBinary(const MIuint64 vnDecimal);
+     static CMIUtilString FormatValist(const CMIUtilString &vrFormating, va_list vArgs);
+     static bool IsAllValidAlphaAndNumeric(const char *vpText);
diff --git a/lldb/distinfo b/lldb/distinfo
index db0b277..94c4193 100644
--- a/lldb/distinfo
+++ b/lldb/distinfo
@@ -18,4 +18,9 @@ SHA1 (patch-source_Utility_regerror.c) = 6bbf8dc3f12e64515d166a475452f3f08d849ad
 SHA1 (patch-source_Utility_regexec.c) = 6e523b4d00d74fb51d5971d415fd3d0a8323461b
 SHA1 (patch-source_Utility_regfree.c) = a3033a951c2773b5fd1209ee2a60be2e042970ee
 SHA1 (patch-source_Utility_regstrlcpy.c) = 284dc5d06d88e243fb91a1225008319b282d6fdc
+SHA1 (patch-tools_lldb-mi_MICmnBase.cpp) = c673fa0c89c509a3c6acad1d5b154396cacb9bb2
+SHA1 (patch-tools_lldb-mi_MICmnBase.h) = 07355c151ee67a71da95056b15d9efee7b033de3
+SHA1 (patch-tools_lldb-mi_MIDriver.cpp) = 14c529a92d37a4a83221013e49b6ed18ef404e3b
 SHA1 (patch-tools_lldb-mi_MIUtilParse.h) = cbd524e70c10cee25e44f1befe594a7198b008b9
+SHA1 (patch-tools_lldb-mi_MIUtilString.cpp) = fb6266ce614eec8a4836fd02a34d5a2ea94c7480
+SHA1 (patch-tools_lldb-mi_MIUtilString.h) = 34419e7f3bfccb6f669ae3075a5a27dd1064d202
diff --git a/lldb/patches/patch-tools_lldb-mi_MICmnBase.cpp b/lldb/patches/patch-tools_lldb-mi_MICmnBase.cpp
new file mode 100644
index 0000000..c0fb711
--- /dev/null
+++ b/lldb/patches/patch-tools_lldb-mi_MICmnBase.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Cannot pass object of non-trivial type 'const CMIUtilString'
+through variadic function.
+
+--- tools/lldb-mi/MICmnBase.cpp.orig	2016-02-21 02:08:07.000000000 +0000
++++ tools/lldb-mi/MICmnBase.cpp
+@@ -127,7 +127,7 @@ CMICmnBase::ClrErrorDescription() const
+ // Throws:  None.
+ //--
+ void
+-CMICmnBase::SetErrorDescriptionn(const CMIUtilString vFormat, ...) const
++CMICmnBase::SetErrorDescriptionn(const char *vFormat, ...) const
+ {
+     va_list args;
+     va_start(args, vFormat);
diff --git a/lldb/patches/patch-tools_lldb-mi_MICmnBase.h b/lldb/patches/patch-tools_lldb-mi_MICmnBase.h
new file mode 100644
index 0000000..0ddd238
--- /dev/null
+++ b/lldb/patches/patch-tools_lldb-mi_MICmnBase.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Cannot pass object of non-trivial type 'const CMIUtilString'
+through variadic function.
+
+--- tools/lldb-mi/MICmnBase.h.orig	2015-08-04 10:24:20.000000000 +0000
++++ tools/lldb-mi/MICmnBase.h
+@@ -28,7 +28,7 @@ class CMICmnBase
+     bool HaveErrorDescription() const;
+     const CMIUtilString &GetErrorDescription() const;
+     void SetErrorDescription(const CMIUtilString &vrTxt) const;
+-    void SetErrorDescriptionn(const CMIUtilString vFormat, ...) const;
++    void SetErrorDescriptionn(const char *vFormat, ...) const;
+     void SetErrorDescriptionNoLog(const CMIUtilString &vrTxt) const;
+     void ClrErrorDescription() const;
+ 
diff --git a/lldb/patches/patch-tools_lldb-mi_MIDriver.cpp b/lldb/patches/patch-tools_lldb-mi_MIDriver.cpp
new file mode 100644
index 0000000..f447e14
--- /dev/null
+++ b/lldb/patches/patch-tools_lldb-mi_MIDriver.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Cannot pass object of non-trivial type 'const CMIUtilString'
+through variadic function.
+
+--- tools/lldb-mi/MIDriver.cpp.orig	2016-02-21 02:08:07.000000000 +0000
++++ tools/lldb-mi/MIDriver.cpp
+@@ -491,7 +491,7 @@ CMIDriver::StartWorkerThreads()
+     {
+         const CMIUtilString errMsg = CMIUtilString::Format(MIRSRC(IDS_THREADMGR_ERR_THREAD_FAIL_CREATE),
+                                                            CMICmnThreadMgrStd::Instance().GetErrorDescription().c_str());
+-        SetErrorDescriptionn(errMsg);
++        SetErrorDescriptionn(errMsg.c_str());
+         return MIstatus::failure;
+     }
+ 
diff --git a/lldb/patches/patch-tools_lldb-mi_MIUtilString.cpp b/lldb/patches/patch-tools_lldb-mi_MIUtilString.cpp
new file mode 100644
index 0000000..4c6889e
--- /dev/null
+++ b/lldb/patches/patch-tools_lldb-mi_MIUtilString.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Cannot pass object of non-trivial type 'const CMIUtilString'
+through variadic function.
+
+--- tools/lldb-mi/MIUtilString.cpp.orig	2016-02-21 02:08:07.000000000 +0000
++++ tools/lldb-mi/MIUtilString.cpp
+@@ -159,7 +159,7 @@ CMIUtilString::FormatPriv(const CMIUtilS
+ // Throws:  None.
+ //--
+ CMIUtilString
+-CMIUtilString::Format(const CMIUtilString vFormating, ...)
++CMIUtilString::Format(const char* vFormating, ...)
+ {
+     va_list args;
+     va_start(args, vFormating);
diff --git a/lldb/patches/patch-tools_lldb-mi_MIUtilString.h b/lldb/patches/patch-tools_lldb-mi_MIUtilString.h
new file mode 100644
index 0000000..6b823b0
--- /dev/null
+++ b/lldb/patches/patch-tools_lldb-mi_MIUtilString.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Cannot pass object of non-trivial type 'const CMIUtilString'
+through variadic function.
+
+--- tools/lldb-mi/MIUtilString.h.orig	2016-02-21 02:08:07.000000000 +0000
++++ tools/lldb-mi/MIUtilString.h
+@@ -30,7 +30,7 @@ class CMIUtilString : public std::string
+ 
+     // Static method:
+   public:
+-    static CMIUtilString Format(const CMIUtilString vFormating, ...);
++    static CMIUtilString Format(const char *vFormating, ...);
+     static CMIUtilString FormatBinary(const MIuint64 vnDecimal);
+     static CMIUtilString FormatValist(const CMIUtilString &vrFormating, va_list vArgs);
+     static bool IsAllValidAlphaAndNumeric(const char *vpText);


Home | Main Index | Thread Index | Old Index