[Lldb-commits] [lldb] r308219 - Fixing LLDB build after refactoring of clang's MacroInfo

2017-07-17 Thread Eugene Zemtsov via lldb-commits 
Author: eugene
Date: Mon Jul 17 13:50:21 2017
New Revision: 308219

URL: http://llvm.org/viewvc/llvm-project?rev=308219&view=rev
Log:
Fixing LLDB build after refactoring of clang's MacroInfo

Modified:
lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp

Modified: 
lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp?rev=308219&r1=308218&r2=308219&view=diff
==
--- lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp 
(original)
+++ lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp 
Mon Jul 17 13:50:21 2017
@@ -451,16 +451,16 @@ void ClangModulesDeclVendorImpl::ForEach
 
   bool first_arg = true;
 
-  for (clang::MacroInfo::arg_iterator ai = macro_info->arg_begin(),
-  ae = macro_info->arg_end();
-   ai != ae; ++ai) {
+  for (auto pi = macro_info->param_begin(),
+pe = macro_info->param_end();
+   pi != pe; ++pi) {
 if (!first_arg) {
   macro_expansion.append(", ");
 } else {
   first_arg = false;
 }
 
-macro_expansion.append((*ai)->getName().str());
+macro_expansion.append((*pi)->getName().str());
   }
 
   if (macro_info->isC99Varargs()) {


___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D35506: Fix after r308190.

2017-07-17 Thread Adrian McCarthy via Phabricator via lldb-commits 
amccarth created this revision.

Update some LLDB code after clang::MacroInfo::arg_iterator was
reandmed to param_iterator.


https://reviews.llvm.org/D35506

Files:
  lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp


Index: lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
===
--- lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
+++ lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
@@ -451,16 +451,16 @@
 
   bool first_arg = true;
 
-  for (clang::MacroInfo::arg_iterator ai = macro_info->arg_begin(),
-  ae = macro_info->arg_end();
-   ai != ae; ++ai) {
+  for (clang::MacroInfo::param_iterator pi = macro_info->param_begin(),
+pe = macro_info->param_end();
+   pi != pe; ++pi) {
 if (!first_arg) {
   macro_expansion.append(", ");
 } else {
   first_arg = false;
 }
 
-macro_expansion.append((*ai)->getName().str());
+macro_expansion.append((*pi)->getName().str());
   }
 
   if (macro_info->isC99Varargs()) {


Index: lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
===
--- lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
+++ lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp
@@ -451,16 +451,16 @@
 
   bool first_arg = true;
 
-  for (clang::MacroInfo::arg_iterator ai = macro_info->arg_begin(),
-  ae = macro_info->arg_end();
-   ai != ae; ++ai) {
+  for (clang::MacroInfo::param_iterator pi = macro_info->param_begin(),
+pe = macro_info->param_end();
+   pi != pe; ++pi) {
 if (!first_arg) {
   macro_expansion.append(", ");
 } else {
   first_arg = false;
 }
 
-macro_expansion.append((*ai)->getName().str());
+macro_expansion.append((*pi)->getName().str());
   }
 
   if (macro_info->isC99Varargs()) {
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D35506: Fix after r308190.

2017-07-17 Thread Faisal Vali via Phabricator via lldb-commits 
faisalv accepted this revision.
faisalv added a comment.
This revision is now accepted and ready to land.

sorry my refactoring broke it - but thanks for the fix!


https://reviews.llvm.org/D35506



___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D35506: Fix after r308190.

2017-07-17 Thread Adrian McCarthy via Phabricator via lldb-commits 
amccarth abandoned this revision.
amccarth added a comment.

Beaten to it by r308219.


https://reviews.llvm.org/D35506



___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits