[LLDB] Attempt to fix MSVC builds after rL250966

[Eugene.Zelenko]

Summary

Looks like MSVC build failure didn't relate to my changes, since I didn't remove lldb/Expression/UtilityFunction.h from any of files changed in rL250966. May be source/Plugins/LanguageRuntime was not properly rebuilt after other change?

[zturner]

lgtm. In the future you don't need to ask for a review to unbreak a build.

[sivachandra]

If this fixes the windows build, can you please commit it ASAP?

[zturner]

I would have done this last night but I didn't have a machine handy. I'll
test it out now and commit if it fixes. And yea, in the future please just
commit fixes.

lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h

 //===-- AppleObjCTrampolineHandler.h ----------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef lldb_AppleObjCTrampolineHandler_h_
 #define lldb_AppleObjCTrampolineHandler_h_
 
 // C Includes
 // C++ Includes
 #include <map>
 #include <vector>
+
 // Other libraries and framework includes
 // Project includes
 #include "lldb/lldb-public.h"
 #include "lldb/Host/Mutex.h"
-
+#include "lldb/Expression/UtilityFunction.h"
 
 namespace lldb_private
 {
   
 class AppleObjCTrampolineHandler {
 public:
-    
     AppleObjCTrampolineHandler (const lldb::ProcessSP &process_sp, 
                                 const lldb::ModuleSP &objc_module_sp);
     
     ~AppleObjCTrampolineHandler();
             
     lldb::ThreadPlanSP
     GetStepThroughDispatchPlan (Thread &thread, 
                                 bool stop_others);
     
     FunctionCaller *
     GetLookupImplementationFunctionCaller ();
     
     bool 
     AddrIsMsgForward (lldb::addr_t addr) const
     {
         return (addr == m_msg_forward_addr || addr == m_msg_forward_stret_addr);
     }
 
-    
     struct DispatchFunction {
     public:
         typedef enum 
         {
             eFixUpNone,
             eFixUpFixed,
             eFixUpToFix
         } FixUpState;
private:
             VTableDescriptor(uint32_t in_flags, lldb::addr_t in_code_start) :
                 flags(in_flags),
                 code_start(in_code_start) {}
             
             uint32_t flags;
             lldb::addr_t code_start;
         };
 
-
         class VTableRegion 
         {
         public:
             VTableRegion() :
                     m_valid (false),
                     m_owner (NULL),
                     m_header_addr (LLDB_INVALID_ADDRESS),
                     m_code_start_addr(0),
private:
         
     private:
         lldb::ProcessWP m_process_wp;
         typedef std::vector<VTableRegion> region_collection;
         lldb::addr_t m_trampoline_header;
         lldb::break_id_t m_trampolines_changed_bp_id;
         region_collection m_regions;
         lldb::ModuleSP m_objc_module_sp;
-        
     };
     
     static const DispatchFunction g_dispatch_functions[];
     
     typedef std::map<lldb::addr_t, int> MsgsendMap; // This table maps an dispatch fn address to the index in g_dispatch_functions
     MsgsendMap m_msgSend_map;
     lldb::ProcessWP m_process_wp;
     lldb::ModuleSP m_objc_module_sp;
     std::unique_ptr<UtilityFunction> m_impl_code;
     Mutex m_impl_function_mutex;
     lldb::addr_t m_impl_fn_addr;
     lldb::addr_t m_impl_stret_fn_addr;
     lldb::addr_t m_msg_forward_addr;
     lldb::addr_t m_msg_forward_stret_addr;
     std::unique_ptr<AppleObjCVTables> m_vtables_ap;
-    
-     
 };
 
-}  // using namespace lldb_private
+} // namespace lldb_private
 
-#endif  // lldb_AppleObjCTrampolineHandler_h_
+#endif // lldb_AppleObjCTrampolineHandler_h_