[llvm-branch-commits] [lldb] r257704 - Merging r257691:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jan 13 17:13:19 2016
New Revision: 257704

URL: http://llvm.org/viewvc/llvm-project?rev=257704&view=rev
Log:
Merging r257691:
------------------------------------------------------------------------
r257691 | hans | 2016-01-13 14:40:24 -0800 (Wed, 13 Jan 2016) | 15 lines

Include IR/DerivedTypes.h instead of IR/Type.h to match LLVM change r256406.

This is similar to r256407 and fixes the following warning:

In file included from /work/llvm-3.8/llvm.src/tools/lldb/source/Target/ThreadPlanCallFunctionUsingABI.cpp:14:
In file included from /work/llvm-3.8/llvm.src/tools/lldb/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h:23:
/work/llvm-3.8/llvm.src/include/llvm/IR/Type.h:350:16: error: inline function 'llvm::Type::getSequentialElementType' is not defined [-Werror,-Wundefined-inline]
  inline Type *getSequentialElementType() const;
               ^
/work/llvm-3.8/llvm.src/include/llvm/IR/Type.h:353:46: note: used here
  Type *getArrayElementType() const { return getSequentialElementType(); }
                                             ^
1 error generated.

I'm not sure why it's not showing on any bots.
------------------------------------------------------------------------

Modified:
    lldb/branches/release_38/   (props changed)
    lldb/branches/release_38/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h

Propchange: lldb/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 13 17:13:19 2016
@@ -1,2 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
+/lldb/trunk:257691

Modified: lldb/branches/release_38/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h?rev=257704&r1=257703&r2=257704&view=diff
==============================================================================
--- lldb/branches/release_38/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h (original)
+++ lldb/branches/release_38/include/lldb/Target/ThreadPlanCallFunctionUsingABI.h Wed Jan 13 17:13:19 2016
@@ -20,7 +20,7 @@
 #include "lldb/Target/ThreadPlanCallFunction.h"
 
 #include "llvm/ADT/ArrayRef.h"
-#include "llvm/IR/Type.h"
+#include "llvm/IR/DerivedTypes.h"
 
 namespace lldb_private {