Remove non const version of GetArchitecture from Target.h

[tberghammer]

Summary

Remove non const version of GetArchitecture from Target.h

The architecture of a target should be updated only by the SetArchitecture method so the target can correctly manage its modules.

Change suggested in D8057

[clayborg]

Are you still going to be making the other patch that involved Target::MergeArchitecture()?

This patch looks good, but I hope we still make the other patch because I don't want more than one location in the code doing architecture merging for Targets.

[tberghammer]

Yes, I plan to commit in both tomorrow (if the git repository start working again)

[tberghammer]

Committed as r232152

include/lldb/Target/Target.h

public:
     /// @param[in] module_sp
     ///     A shared pointer reference to the module that checked.
     ///
     /// @return \b true if the module should be excluded, \b false otherwise.
     //------------------------------------------------------------------
     bool
     ModuleIsExcludedForUnconstrainedSearches (const lldb::ModuleSP &module_sp);
 
-    ArchSpec &
-    GetArchitecture ()
-    {
-        return m_arch;
-    }
-    
     const ArchSpec &
     GetArchitecture () const
     {
         return m_arch;
     }
     
     //------------------------------------------------------------------
     /// Set the architecture for this target.

source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

if (GetID() != LLDB_INVALID_PROCESS_ID)
                 log->Printf ("ProcessGDBRemote::%s gdb-remote did not have process architecture, using gdb-remote host architecture %s %s",
                              __FUNCTION__,
                              process_arch.GetArchitectureName () ? process_arch.GetArchitectureName () : "<null>",
                              process_arch.GetTriple().getTriple ().c_str() ? process_arch.GetTriple().getTriple ().c_str() : "<null>");
         }
 
         if (process_arch.IsValid())
         {
-            ArchSpec &target_arch = GetTarget().GetArchitecture();
+            const ArchSpec &target_arch = GetTarget().GetArchitecture();
             if (target_arch.IsValid())
             {
                 if (log)
                     log->Printf ("ProcessGDBRemote::%s analyzing target arch, currently %s %s",
                                  __FUNCTION__,
                                  target_arch.GetArchitectureName () ? target_arch.GetArchitectureName () : "<null>",
                                  target_arch.GetTriple().getTriple ().c_str() ? target_arch.GetTriple().getTriple ().c_str() : "<null>");
 
if (GetID() != LLDB_INVALID_PROCESS_ID)
                                      __FUNCTION__,
                                      process_arch.GetArchitectureName () ? process_arch.GetArchitectureName () : "<null>",
                                      process_arch.GetTriple().getTriple ().c_str() ? process_arch.GetTriple().getTriple ().c_str() : "<null>");
                 }
                 else
                 {
                     // Fill in what is missing in the triple
                     const llvm::Triple &remote_triple = process_arch.GetTriple();
-                    llvm::Triple &target_triple = target_arch.GetTriple();
-                    if (target_triple.getVendorName().size() == 0)
+                    llvm::Triple new_target_triple = target_arch.GetTriple();
+                    if (new_target_triple.getVendorName().size() == 0)
                     {
-                        target_triple.setVendor (remote_triple.getVendor());
+                        new_target_triple.setVendor (remote_triple.getVendor());
 
-                        if (target_triple.getOSName().size() == 0)
+                        if (new_target_triple.getOSName().size() == 0)
                         {
-                            target_triple.setOS (remote_triple.getOS());
+                            new_target_triple.setOS (remote_triple.getOS());
 
-                            if (target_triple.getEnvironmentName().size() == 0)
-                                target_triple.setEnvironment (remote_triple.getEnvironment());
-                        }
+                            if (new_target_triple.getEnvironmentName().size() == 0)
+                                new_target_triple.setEnvironment (remote_triple.getEnvironment());
                         }
 
+                        ArchSpec new_target_arch = target_arch;
+                        new_target_arch.SetTriple(new_target_triple);
+                        GetTarget().SetArchitecture(new_target_arch);
+                    }
                 }
 
                 if (log)
                     log->Printf ("ProcessGDBRemote::%s final target arch after adjustments for remote architecture: %s %s",
                                  __FUNCTION__,
                                  target_arch.GetArchitectureName () ? target_arch.GetArchitectureName () : "<null>",
                                  target_arch.GetTriple().getTriple ().c_str() ? target_arch.GetTriple().getTriple ().c_str() : "<null>");
             }