I was also eliminating unused const versions of functions in that tree. It wasn't used, so I don't think it matters, but I shouldn't have done it at the same time...
Jim > On May 22, 2019, at 5:24 PM, Frédéric Riss <fr...@apple.com> wrote: > > > >> On May 22, 2019, at 5:12 PM, Jim Ingham via lldb-commits >> <lldb-commits@lists.llvm.org> wrote: >> >> Author: jingham >> Date: Wed May 22 17:12:45 2019 >> New Revision: 361447 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=361447&view=rev >> Log: >> Ack, added DWARFTypeUnit to the wrong target... >> >> LLDB -> liblldbcore.a >> >> Modified: >> lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h >> lldb/trunk/lldb.xcodeproj/project.pbxproj >> lldb/trunk/lldb.xcodeproj/xcshareddata/xcschemes/lldb-gtest.xcscheme >> lldb/trunk/source/Host/common/Editline.cpp >> >> Modified: lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h >> URL: >> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h?rev=361447&r1=361446&r2=361447&view=diff >> ============================================================================== >> --- lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h (original) >> +++ lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h Wed May 22 >> 17:12:45 2019 >> @@ -441,7 +441,7 @@ public: >> "the target.max-children-count setting.\n"; >> } >> >> - const CommandHistory &GetCommandHistory() const { return >> m_command_history; } >> + //const CommandHistory &GetCommandHistory() const { return >> m_command_history; } >> >> CommandHistory &GetCommandHistory() { return m_command_history; } > > I don’t think you meant to commit this ^^^^^^ ? > >> >> Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj >> URL: >> http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=361447&r1=361446&r2=361447&view=diff >> ============================================================================== >> --- lldb/trunk/lldb.xcodeproj/project.pbxproj (original) >> +++ lldb/trunk/lldb.xcodeproj/project.pbxproj Wed May 22 17:12:45 2019 >> @@ -269,7 +269,7 @@ >> 268900C613353E5F00698AC0 /* DWARFFormValue.cpp in Sources */ = >> {isa = PBXBuildFile; fileRef = 260C89D310F57C5600BB2B04 /* >> DWARFFormValue.cpp */; }; >> 4CD44CFB20B37C440003557C /* DWARFIndex.cpp in Sources */ = {isa >> = PBXBuildFile; fileRef = 4CD44CF820B37C440003557C /* DWARFIndex.cpp */; }; >> 4C38996421B9AECD002BAEF4 /* DWARFLocationExpression.cpp in >> Sources */ = {isa = PBXBuildFile; fileRef = 4C38996221B9AECC002BAEF4 /* >> DWARFLocationExpression.cpp */; }; >> - 4C645D042295D3B600D3C034 /* DWARFTypeUnit.cpp in Sources */ = >> {isa = PBXBuildFile; fileRef = 4C645D022295D3B500D3C034 /* DWARFTypeUnit.cpp >> */; }; >> + 4C645D0822961B3C00D3C034 /* DWARFTypeUnit.cpp in Sources */ = >> {isa = PBXBuildFile; fileRef = 4C645D022295D3B500D3C034 /* DWARFTypeUnit.cpp >> */; }; >> AFE228832060699D0042D0C8 /* DWARFUnit.cpp in Sources */ = {isa >> = PBXBuildFile; fileRef = 7F2AAA5920601BE000A422D8 /* DWARFUnit.cpp */; }; >> 26FFC19B14FC072100087D58 /* DYLDRendezvous.cpp in Sources */ = >> {isa = PBXBuildFile; fileRef = 26FFC19514FC072100087D58 /* >> DYLDRendezvous.cpp */; }; >> 49CA96FC1E6AACC900C03FEE /* DataBufferHeap.cpp in Sources */ = >> {isa = PBXBuildFile; fileRef = 49CA96E61E6AAC6600C03FEE /* >> DataBufferHeap.cpp */; }; >> @@ -7480,7 +7480,7 @@ >> ); >> runOnlyForDeploymentPostprocessing = 0; >> shellPath = "/bin/sh -x"; >> - shellScript = "# Run the just-built gtest >> executable\n\n# Uncomment this to see the steps in action\n# set -x\n\n# We >> need to hide the lldb.py that goes into BUILT_PRODUCTS\n# because it will >> conflict with finding the lldb module later,\n# which causes the python >> exception tests to fail.\nif [ -f \"${BUILT_PRODUCTS_DIR}/lldb.py\" ]; >> then\n mv -f \"${BUILT_PRODUCTS_DIR}/lldb.py\" >> \"${BUILT_PRODUCTS_DIR}/park.lldb.py\"\nfi\n\n# Tell lldb-gtest where to >> find the lldb package\nexport >> PYTHONPATH=${BUILT_PRODUCTS_DIR}/LLDB.framework/Resources/Python\n\n# Set >> the terminal to VT100 so that the editline internals don't\n# fail.\nexport >> TERM=vt100\n\n# We must redirect stdin to /dev/null: without this, >> xcodebuild\n# will wait forever for input when we run the >> TestExceptionStateChecking\n# test.\n${BUILT_PRODUCTS_DIR}/lldb-gtest >> --gtest_output=xml:${BUILD_DIR}/gtest-results.xml < >> /dev/null\nRETCODE=$?\n\nif [ -f \"${BUILT_PRODUCTS_DIR}/park.lldb.py\" ]; >> then\nmv -f \"${BUILT_PRODUCTS_DIR}/park.lldb.py\" >> \"${BUILT_PRODUCTS_DIR}/lldb.py\"\nfi\n\nexit ${RETCODE}"; >> + shellScript = "# Run the just-built gtest >> executable\n\n# Uncomment this to see the steps in action\n# set -x\n\n# We >> need to hide the lldb.py that goes into BUILT_PRODUCTS\n# because it will >> conflict with finding the lldb module later,\n# which causes the python >> exception tests to fail.\nif [ -f \"${BUILT_PRODUCTS_DIR}/lldb.py\" ]; >> then\n mv -f \"${BUILT_PRODUCTS_DIR}/lldb.py\" >> \"${BUILT_PRODUCTS_DIR}/park.lldb.py\"\nfi\n\n# Tell lldb-gtest where to >> find the lldb package\nexport >> PYTHONPATH=${BUILT_PRODUCTS_DIR}/LLDB.framework/Resources/Python\n\n# Set >> the terminal to VT100 so that the editline internals don't\n# fail.\nexport >> TERM=vt100\n\n# We must redirect stdin to /dev/null: without this, >> xcodebuild\n# will wait forever for input when we run the >> TestExceptionStateChecking\n# test.\n${BUILT_PRODUCTS_DIR}/lldb-gtest >> --gtest_output=xml:${BUILD_DIR}/gtest-results.xml < >> /dev/null\nRETCODE=$?\n\nif [ -f \"${BUILT_PRODUCTS_DIR}/park.lldb.py\" ]; >> then\nmv -f \"${BUILT_PRODUCTS_DIR}/park.lldb.py\" >> \"${BUILT_PRODUCTS_DIR}/lldb.py\"\nfi\n\nexit ${RETCODE}\n"; >> }; >> 23E2E5461D904B8A006F38BB /* Copy Inputs content to run dir */ = >> { >> isa = PBXShellScriptBuildPhase; >> @@ -7903,7 +7903,6 @@ >> 26680337116005F1008E1FE4 /* SBBreakpoint.cpp in >> Sources */, >> 26DE204511618ADA00A093E2 /* SBAddress.cpp in >> Sources */, >> 26DE204711618AED00A093E2 /* SBSymbolContext.cpp >> in Sources */, >> - 4C645D042295D3B600D3C034 /* DWARFTypeUnit.cpp >> in Sources */, >> 26DE204D11618E7A00A093E2 /* SBModule.cpp in >> Sources */, >> 26DE205D1161901400A093E2 /* SBFunction.cpp in >> Sources */, >> 26DE205F1161901B00A093E2 /* SBCompileUnit.cpp >> in Sources */, >> @@ -8040,6 +8039,7 @@ >> 2689002113353DDE00698AC0 /* >> CommandObjectQuit.cpp in Sources */, >> 2689002213353DDE00698AC0 /* >> CommandObjectRegister.cpp in Sources */, >> 26BC17AF18C7F4CB00D2196D /* >> RegisterContextPOSIXCore_x86_64.cpp in Sources */, >> + 4C645D0822961B3C00D3C034 /* DWARFTypeUnit.cpp >> in Sources */, >> 2619C4842107A9A2009CDE81 /* >> RegisterContextMinidump_ARM64.cpp in Sources */, >> 2689002313353DDE00698AC0 /* >> CommandObjectScript.cpp in Sources */, >> 2689002413353DDE00698AC0 /* >> CommandObjectSettings.cpp in Sources */, >> >> Modified: >> lldb/trunk/lldb.xcodeproj/xcshareddata/xcschemes/lldb-gtest.xcscheme >> URL: >> http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/xcshareddata/xcschemes/lldb-gtest.xcscheme?rev=361447&r1=361446&r2=361447&view=diff >> ============================================================================== >> --- lldb/trunk/lldb.xcodeproj/xcshareddata/xcschemes/lldb-gtest.xcscheme >> (original) >> +++ lldb/trunk/lldb.xcodeproj/xcshareddata/xcschemes/lldb-gtest.xcscheme Wed >> May 22 17:12:45 2019 >> @@ -27,8 +27,6 @@ >> selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" >> selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" >> shouldUseLaunchSchemeArgsEnv = "YES"> >> - <Testables> >> - </Testables> >> <MacroExpansion> >> <BuildableReference >> BuildableIdentifier = "primary" >> @@ -38,11 +36,11 @@ >> ReferencedContainer = "container:lldb.xcodeproj"> >> </BuildableReference> >> </MacroExpansion> >> - <AdditionalOptions> >> - </AdditionalOptions> >> + <Testables> >> + </Testables> >> </TestAction> >> <LaunchAction >> - buildConfiguration = "DebugClang" >> + buildConfiguration = "Debug" >> selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" >> selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" >> launchStyle = "0" >> @@ -62,8 +60,6 @@ >> ReferencedContainer = "container:lldb.xcodeproj"> >> </BuildableReference> >> </BuildableProductRunnable> >> - <AdditionalOptions> >> - </AdditionalOptions> >> </LaunchAction> >> <ProfileAction >> buildConfiguration = "Release" >> >> Modified: lldb/trunk/source/Host/common/Editline.cpp >> URL: >> http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Editline.cpp?rev=361447&r1=361446&r2=361447&view=diff >> ============================================================================== >> --- lldb/trunk/source/Host/common/Editline.cpp (original) >> +++ lldb/trunk/source/Host/common/Editline.cpp Wed May 22 17:12:45 2019 >> @@ -978,7 +978,9 @@ void Editline::ConfigureEditor(bool mult >> TerminalSizeChanged(); >> >> if (m_history_sp && m_history_sp->IsValid()) { >> - m_history_sp->Load(); >> + if (!m_history_sp->Load()) { >> + fputs("Could not load history file\n.", m_output_file); >> + } >> el_wset(m_editline, EL_HIST, history, m_history_sp->GetHistoryPtr()); >> } >> el_set(m_editline, EL_CLIENTDATA, this); >> >> >> _______________________________________________ >> lldb-commits mailing list >> lldb-commits@lists.llvm.org >> https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits > _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
