Redebug

include/clasp/core/backtrace.h

@@ -82,7 +82,7 @@ FORWARD(SectionedAddress);
 
 namespace core {
 
-T_sp dwarf_ep(size_t frameIndex, llvmo::ObjectFile_sp ofi, llvmo::DWARFContext_sp dcontext, llvmo::SectionedAddress_sp sa,
-              void*& codeStart, void*& functionStartAddress, bool& XEPp, int& arityCode);
+T_sp dwarf_ep(size_t frameIndex, llvmo::ObjectFile_sp ofi, llvmo::DWARFContext_sp dcontext, void* absolute_ip,
+              void*& functionStartAddress, bool& XEPp, int& arityCode);
 
 } // namespace core

include/clasp/core/function.h

@@ -228,7 +228,11 @@ class SimpleFun_O : public Function_O {
   SimpleFun_O(FunctionDescription_sp fdesc, T_sp code,
               const ClaspXepTemplate& entry_point);
   CL_DEFMETHOD FunctionDescription_sp functionDescription() const { return this->_FunctionDescription; };
-  virtual Pointer_sp defaultEntryAddress() const;
+  // These two are useful for debugging things at a low level.
+  // They're unsafe.
+  Pointer_sp defaultEntryAddress() const;
+  Pointer_sp arityEntryAddress(size_t arity) const;
+
   // Necessary since we have templated subclasses in clbind.
   // Doing so means the static analyzer marks SimpleFun as a
   // TemplatedKind, which makes the GC use templatedSizeof to
@@ -293,7 +297,6 @@ class CoreFun_O : public General_O {
 public:
   CL_DEFMETHOD FunctionDescription_sp functionDescription() const { return this->_FunctionDescription; };
   virtual void fixupInternalsForSnapshotSaveLoad(snapshotSaveLoad::Fixup* fixup);
-  virtual Pointer_sp defaultEntryAddress() const;
   string __repr__() const;
 };
 
@@ -337,7 +340,6 @@ class SimpleCoreFun_O : public SimpleFun_O {
   static SimpleCoreFun_sp make(FunctionDescription_sp fdesc, ClaspCoreFunction main, ClaspXepAnonymousFunction* xep);
 
 public:
-  virtual Pointer_sp defaultEntryAddress() const;
   llvmo::ObjectFile_sp code() const;
   CoreFun_sp localFun() const;
   string __repr__() const;
@@ -372,7 +374,6 @@ class BytecodeSimpleFun_O : public SimpleFun_O {
                             unsigned int bytecodeSize, BytecodeTrampolineFunction trampoline);
 
 public:
-  virtual Pointer_sp defaultEntryAddress() const;
   BytecodeModule_sp code() const;
   string __repr__() const;
 

include/clasp/core/sourceFileInfo.fwd.h

@@ -29,9 +29,4 @@ THE SOFTWARE.
 namespace core {
 FORWARD(FileScope);
 FORWARD(SourcePosInfo);
-
-uint clasp_sourcePosInfo_fileHandle(SourcePosInfo_sp info);
-size_t clasp_sourcePosInfo_filepos(SourcePosInfo_sp info);
-uint clasp_sourcePosInfo_lineno(SourcePosInfo_sp info);
-uint clasp_sourcePosInfo_column(SourcePosInfo_sp info);
 }; // namespace core

include/clasp/core/sourceFileInfo.h

@@ -26,8 +26,6 @@ THE SOFTWARE.
 */
 /* -^- */
 
-#define USE_WEAK_HASH_TABLE_FOR_SOURCE_POS_INFO 1
-
 #include <clasp/core/object.h>
 #include <clasp/core/pathname.fwd.h>
 #include <clasp/core/fileSystem.fwd.h>
@@ -58,22 +56,14 @@ class FileScope_O : public Scope_O {
   explicit FileScope_O();
   virtual ~FileScope_O(){};
   void initialize() override;
-  GCPRIVATE : // instance variables here
-              Pathname_sp _pathname;
-  /*! Allocated buffer that stores the file name until the program exits */
-  char* _PermanentPathName;
-  char* _PermanentFileName;
+GCPRIVATE : // instance variables here
+  Pathname_sp _pathname;
   int _FileHandle;
 
 public: // Functions here
   int fileHandle() const { return this->_FileHandle; };
-  string fileName() const;
-  string parentPathName() const;
-  string namestring() const;
   CL_LISPIFY_NAME("FileScope-pathname");
   CL_DEFMETHOD Pathname_sp pathname() const { return this->_pathname; };
-  const char* permanentPathName();
-  const char* permanentFileName();
   string __repr__() const override;
 }; // FileScope class
 
@@ -90,10 +80,10 @@ class SourcePosInfo_O : public General_O {
 public: // ctor/dtor for classes with shared virtual base
   explicit SourcePosInfo_O()
       : _FileId(UNDEF_UINT), _Filepos(0), _Lineno(0), _Column(0), _FunctionScope(nil<T_O>()),
-        _InlinedAt(nil<T_O>()){}; //, _Filepos(0) {};
+        _InlinedAt(nil<T_O>()){};
 public:                           // instance variables here
   SourcePosInfo_O(uint spf, size_t filepos, uint spln, uint spc, T_sp function_scope, T_sp inlined_at)
-      : _FileId(spf), _Filepos(filepos), _Lineno(spln), _Column(spc), //, _Expander(expander) {}
+      : _FileId(spf), _Filepos(filepos), _Lineno(spln), _Column(spc),
         _FunctionScope(function_scope), _InlinedAt(inlined_at){};
 
 public:
@@ -109,18 +99,15 @@ class SourcePosInfo_O : public General_O {
   int column() const { return this->_Column; };
   T_sp function_scope() const { return this->_FunctionScope; };
   T_sp inlined_at() const { return this->_InlinedAt; };
-  //  bool equalp(T_sp obj) const;
 public:
   uint _FileId;
   size_t _Filepos;
   uint _Lineno;
   uint _Column;
   T_sp _FunctionScope;
   T_sp _InlinedAt;
-  //	Function_sp 	_Expander;
-  CL_DEFMETHOD size_t source_file_pos_filepos() const { return this->_Filepos; }
-  CL_DEFMETHOD size_t source_file_pos_lineno() const { return this->_Lineno; }
-  CL_DEFMETHOD size_t source_file_pos_column() const { return this->_Column; }
+  CL_LISPIFY_NAME(SourcePosInfo/pathname)
+  CL_DEFMETHOD Pathname_sp pathname() const;
   SourcePosInfo_sp source_pos_info_copy() const;
   T_sp setf_source_pos_info_inlined_at(T_sp inlinedAt);
   T_sp source_pos_info_inlined_at() const;
@@ -133,32 +120,6 @@ SourcePosInfo_sp core__makeSourcePosInfo(const string& filename, bool filenamep,
                                          bool linenop, size_t column, bool columnp, T_sp function_scope = nil<T_O>(),
                                          bool function_scope_p = false, T_sp inlined_at = nil<T_O>(), bool inlined_at_p = false,
                                          T_sp defaults = nil<T_O>(), bool defaults_p = false);
-
-inline core::Fixnum safe_fileId(T_sp spi) {
-  if (spi.nilp())
-    return 0;
-  return gc::As<SourcePosInfo_sp>(spi)->_FileId;
-}
-
-inline core::Fixnum safe_filepos(T_sp spi) {
-  if (spi.nilp())
-    return 0;
-  return gc::As<SourcePosInfo_sp>(spi)->_FileId;
-}
-
-inline core::Fixnum safe_lineno(T_sp spi) {
-  if (spi.nilp())
-    return 0;
-  return gc::As<SourcePosInfo_sp>(spi)->_Lineno;
-}
-
-inline core::Fixnum safe_column(T_sp spi) {
-  if (spi.nilp())
-    return 0;
-  return gc::As<SourcePosInfo_sp>(spi)->_Column;
-}
-// Pass all arguments to a FunctionClosure
-#define SOURCE_POS_INFO_FIELDS(spi) safe_fileId(spi), safe_filepos(spi), safe_lineno(spi), safe_column(spi)
 }; // namespace core
 template <> struct gctools::GCInfo<core::SourcePosInfo_O> {
   static bool constexpr NeedsInitialization = false;

include/clasp/llvmo/llvmoExpose.h

@@ -2913,7 +2913,36 @@ template <> struct to_object<llvm::UndefValue*> {
   static core::T_sp convert(llvm::UndefValue* ptr) { return ((llvmo::UndefValue_O::create(ptr))); }
 };
 }; // namespace translate
-    ;
+
+namespace llvmo {
+FORWARD(PoisonValue);
+class PoisonValue_O : public UndefValue_O {
+  LISP_EXTERNAL_CLASS(llvmo, LlvmoPkg, llvm::PoisonValue, PoisonValue_O, "PoisonValue", UndefValue_O);
+  typedef llvm::PoisonValue ExternalType;
+  typedef llvm::PoisonValue* PointerToExternalType;
+
+public:
+  PointerToExternalType wrappedPtr() { return llvm_cast<ExternalType>(this->_ptr); }
+  PointerToExternalType wrappedPtr() const { return llvm_cast<ExternalType>(this->_ptr); }
+  void set_wrapped(PointerToExternalType ptr) {
+    this->_ptr = ptr;
+  }
+  static PoisonValue_sp create(llvm::PoisonValue* ptr);
+  PoisonValue_O() : Base(){};
+  ~PoisonValue_O() {}
+
+public:
+  string __repr__() const;
+}; // PoisonValue_O
+}; // namespace llvmo
+/* from_object translators */
+/* to_object translators */
+
+namespace translate {
+template <> struct to_object<llvm::PoisonValue*> {
+  static core::T_sp convert(llvm::PoisonValue* ptr) { return ((llvmo::PoisonValue_O::create(ptr))); }
+};
+}; // namespace translate
 
 namespace llvmo {
 FORWARD(ConstantPointerNull);

repos.sexp

@@ -108,7 +108,7 @@
  (:name :cleavir
   :repository "https://github.com/s-expressionists/Cleavir.git"
   :directory "src/lisp/kernel/contrib/Cleavir/"
-  :commit "e41eae5dcac98532148ffc9c524fbfefe70c2965")
+  :commit "18129fc245603a27ff49e4705e47a4470d6f2ce9")
  (:name :closer-mop
   :repository "https://github.com/pcostanza/closer-mop.git"
   :directory "src/lisp/kernel/contrib/closer-mop/"

src/analysis/clasp_gc.sif

@@ -103,25 +103,26 @@
                           "llvmo::Constant_O" "llvmo::FunctionCallee_O" "llvmo::DIBasicType_O"
                           "llvmo::DIBuilder_O" "core::NativeVector_int_O" "llvmo::APInt_O"
                           "llvmo::APFloat_O" "core::SimpleMDArrayCharacter_O"
-                          "core::SimpleCharacterString_O" "core::Symbol_O" "core::Array_O"
-                          "core::MDArray_byte4_t_O" "llvmo::Argument_O" "core::Iterator_O"
-                          "llvmo::IRBuilderBase_O" "core::Null_O" "core::RequiredArgument"
-                          "core::SingleDispatchMethod_O" "comp::VarInfo_O" "core::CxxObject_O"
-                          "llvmo::ReturnInst_O" "llvmo::FunctionType_O" "clbind::DummyCreator_O"
-                          "core::MDArray_byte16_t_O" "llvmo::DIContext_O" "llvmo::JITDylib_O"
-                          "llvmo::Type_O" "core::Pointer_O" "llvmo::UnreachableInst_O"
-                          "core::ComplexVector_int64_t_O" "core::FileScope_O" "core::Float_O"
-                          "core::SimpleMDArray_byte4_t_O" "llvmo::DIDerivedType_O"
-                          "comp::EntryCloseFixup_O" "core::SimpleVector_int64_t_O"
-                          "llvmo::ConstantDataSequential_O" "comp::EntryFixup_O"
-                          "core::MDArray_double_O" "llvmo::StoreInst_O" "llvmo::DebugLoc_O"
-                          "core::WeakPointer_O" "core::DestDynEnv_O" "comp::Annotation_O"
-                          "core::DynEnv_O" "core::BytecodeAstBlock_O" "comp::LexSetFixup_O"
-                          "core::SimpleMDArray_byte8_t_O" "comp::SymbolMacroVarInfo_O"
-                          "core::UnwindProtectDynEnv_O" "comp::LexicalInfo_O"
-                          "llvmo::Instruction_O" "core::FileStream_O" "comp::ExitFixup_O"
-                          "core::Rational_O" "core::CatchDynEnv_O" "core::MDArrayCharacter_O"
-                          "llvmo::LandingPadInst_O" "core::ImmobileObject_O" "core::Function_O"
+                          "core::SimpleCharacterString_O" "llvmo::PoisonValue_O" "core::Symbol_O"
+                          "core::Array_O" "core::MDArray_byte4_t_O" "llvmo::Argument_O"
+                          "core::Iterator_O" "llvmo::IRBuilderBase_O" "core::Null_O"
+                          "core::RequiredArgument" "core::SingleDispatchMethod_O" "comp::VarInfo_O"
+                          "core::CxxObject_O" "llvmo::ReturnInst_O" "llvmo::FunctionType_O"
+                          "clbind::DummyCreator_O" "core::MDArray_byte16_t_O" "llvmo::DIContext_O"
+                          "llvmo::JITDylib_O" "llvmo::Type_O" "core::Pointer_O"
+                          "llvmo::UnreachableInst_O" "core::ComplexVector_int64_t_O"
+                          "core::FileScope_O" "core::Float_O" "core::SimpleMDArray_byte4_t_O"
+                          "llvmo::DIDerivedType_O" "comp::EntryCloseFixup_O"
+                          "core::SimpleVector_int64_t_O" "llvmo::ConstantDataSequential_O"
+                          "comp::EntryFixup_O" "core::MDArray_double_O" "llvmo::StoreInst_O"
+                          "llvmo::DebugLoc_O" "core::WeakPointer_O" "core::DestDynEnv_O"
+                          "comp::Annotation_O" "core::DynEnv_O" "core::BytecodeAstBlock_O"
+                          "comp::LexSetFixup_O" "core::SimpleMDArray_byte8_t_O"
+                          "comp::SymbolMacroVarInfo_O" "core::UnwindProtectDynEnv_O"
+                          "comp::LexicalInfo_O" "llvmo::Instruction_O" "core::FileStream_O"
+                          "comp::ExitFixup_O" "core::Rational_O" "core::CatchDynEnv_O"
+                          "core::MDArrayCharacter_O" "llvmo::LandingPadInst_O"
+                          "core::ImmobileObject_O" "core::Function_O"
                           "core::SimpleMDArray_int2_t_O" "core::HashTableEql_O"
                           "comp::ConstantInfo_O" "mp::ConditionVariable_O" "core::Real_O"
                           "core::Lisp" "core::MDArray_byte8_t_O" "core::BytecodeAstThe_O"
@@ -4362,6 +4363,14 @@
              :offset-base-ctype "llvmo::UndefValue_O" :layout-offset-field-names ("_Class")}
 {fixed-field :offset-type-cxx-identifier "RAW_POINTER_OFFSET" :offset-ctype "UnknownType"
              :offset-base-ctype "llvmo::UndefValue_O" :layout-offset-field-names ("_ptr")}
+{class-kind :stamp-name "STAMPWTAG_llvmo__PoisonValue_O" :stamp-key "llvmo::PoisonValue_O"
+            :parent-class "llvmo::UndefValue_O" :lisp-class-base "llvmo::UndefValue_O"
+            :root-class "core::T_O" :stamp-wtag 3 :definition-data "IS_POLYMORPHIC"}
+{fixed-field :offset-type-cxx-identifier "SMART_PTR_OFFSET"
+             :offset-ctype "gctools::smart_ptr<core::Instance_O>"
+             :offset-base-ctype "llvmo::PoisonValue_O" :layout-offset-field-names ("_Class")}
+{fixed-field :offset-type-cxx-identifier "RAW_POINTER_OFFSET" :offset-ctype "UnknownType"
+             :offset-base-ctype "llvmo::PoisonValue_O" :layout-offset-field-names ("_ptr")}
 {class-kind :stamp-name "STAMPWTAG_llvmo__ConstantArray_O" :stamp-key "llvmo::ConstantArray_O"
             :parent-class "llvmo::Constant_O" :lisp-class-base "llvmo::Constant_O"
             :root-class "core::T_O" :stamp-wtag 3 :definition-data "IS_POLYMORPHIC"}
@@ -4834,12 +4843,6 @@
 {fixed-field :offset-type-cxx-identifier "SMART_PTR_OFFSET"
              :offset-ctype "gctools::smart_ptr<core::Pathname_O>"
              :offset-base-ctype "core::FileScope_O" :layout-offset-field-names ("_pathname")}
-{fixed-field :offset-type-cxx-identifier "RAW_POINTER_OFFSET" :offset-ctype "UnknownType"
-             :offset-base-ctype "core::FileScope_O"
-             :layout-offset-field-names ("_PermanentPathName")}
-{fixed-field :offset-type-cxx-identifier "RAW_POINTER_OFFSET" :offset-ctype "UnknownType"
-             :offset-base-ctype "core::FileScope_O"
-             :layout-offset-field-names ("_PermanentFileName")}
 {fixed-field :offset-type-cxx-identifier "ctype_int" :offset-ctype "int"
              :offset-base-ctype "core::FileScope_O" :layout-offset-field-names ("_FileHandle")}
 {class-kind :stamp-name "STAMPWTAG_core__Path_O" :stamp-key "core::Path_O"

src/analysis/clasp_gc_cando.sif

@@ -176,18 +176,19 @@
                           "chem::ResidueOut" "core::NativeVector_int_O" "llvmo::DIBasicType_O"
                           "llvmo::DIBuilder_O" "llvmo::APInt_O" "llvmo::APFloat_O"
                           "core::SimpleMDArrayCharacter_O" "core::SimpleCharacterString_O"
-                          "core::Symbol_O" "chem::AtomOrBondMatchNode_O" "core::Array_O"
-                          "core::MDArray_byte4_t_O" "llvmo::Argument_O" "chem::FFItorDb_O"
-                          "llvmo::IRBuilderBase_O" "units::Unit_O" "core::Null_O"
-                          "chem::RingFinder_O" "chem::IterateBonds_O" "core::RequiredArgument"
-                          "core::SingleDispatchMethod_O" "chem::CDFragment_O" "comp::VarInfo_O"
-                          "core::CxxObject_O" "llvmo::ReturnInst_O" "llvmo::FunctionType_O"
-                          "clbind::DummyCreator_O" "chem::EnergyDihedralRestraint"
-                          "core::MDArray_byte16_t_O" "llvmo::DIContext_O"
-                          "chem::FFNonbondCrossTermTable_O" "llvmo::JITDylib_O" "llvmo::Type_O"
-                          "chem::Command_O" "core::Pointer_O" "llvmo::UnreachableInst_O"
-                          "core::ComplexVector_int64_t_O" "chem::FFParameterBaseDb_O"
-                          "core::FileScope_O" "core::SimpleMDArray_byte4_t_O" "core::Float_O"
+                          "llvmo::PoisonValue_O" "core::Symbol_O" "chem::AtomOrBondMatchNode_O"
+                          "core::Array_O" "core::MDArray_byte4_t_O" "llvmo::Argument_O"
+                          "chem::FFItorDb_O" "llvmo::IRBuilderBase_O" "units::Unit_O"
+                          "core::Null_O" "chem::RingFinder_O" "chem::IterateBonds_O"
+                          "core::RequiredArgument" "core::SingleDispatchMethod_O"
+                          "chem::CDFragment_O" "comp::VarInfo_O" "core::CxxObject_O"
+                          "llvmo::ReturnInst_O" "llvmo::FunctionType_O" "clbind::DummyCreator_O"
+                          "chem::EnergyDihedralRestraint" "core::MDArray_byte16_t_O"
+                          "llvmo::DIContext_O" "chem::FFNonbondCrossTermTable_O"
+                          "llvmo::JITDylib_O" "llvmo::Type_O" "chem::Command_O" "core::Pointer_O"
+                          "llvmo::UnreachableInst_O" "core::ComplexVector_int64_t_O"
+                          "chem::FFParameterBaseDb_O" "core::FileScope_O"
+                          "core::SimpleMDArray_byte4_t_O" "core::Float_O"
                           "chem::EnergySketchStretch" "chem::ResidueTest_O"
                           "chem::RestraintDistance_O" "llvmo::DIDerivedType_O" "chem::SmartsRoot_O"
                           "chem::TwisterDriver_O" "comp::EntryCloseFixup_O"
@@ -9195,6 +9196,14 @@
              :offset-base-ctype "llvmo::UndefValue_O" :layout-offset-field-names ("_Class")}
 {fixed-field :offset-type-cxx-identifier "RAW_POINTER_OFFSET" :offset-ctype "UnknownType"
              :offset-base-ctype "llvmo::UndefValue_O" :layout-offset-field-names ("_ptr")}
+{class-kind :stamp-name "STAMPWTAG_llvmo__PoisonValue_O" :stamp-key "llvmo::PoisonValue_O"
+            :parent-class "llvmo::UndefValue_O" :lisp-class-base "llvmo::UndefValue_O"
+            :root-class "core::T_O" :stamp-wtag 3 :definition-data "IS_POLYMORPHIC"}
+{fixed-field :offset-type-cxx-identifier "SMART_PTR_OFFSET"
+             :offset-ctype "gctools::smart_ptr<core::Instance_O>"
+             :offset-base-ctype "llvmo::PoisonValue_O" :layout-offset-field-names ("_Class")}
+{fixed-field :offset-type-cxx-identifier "RAW_POINTER_OFFSET" :offset-ctype "UnknownType"
+             :offset-base-ctype "llvmo::PoisonValue_O" :layout-offset-field-names ("_ptr")}
 {class-kind :stamp-name "STAMPWTAG_llvmo__ConstantArray_O" :stamp-key "llvmo::ConstantArray_O"
             :parent-class "llvmo::Constant_O" :lisp-class-base "llvmo::Constant_O"
             :root-class "core::T_O" :stamp-wtag 3 :definition-data "IS_POLYMORPHIC"}
@@ -9737,12 +9746,6 @@
 {fixed-field :offset-type-cxx-identifier "SMART_PTR_OFFSET"
              :offset-ctype "gctools::smart_ptr<core::Pathname_O>"
              :offset-base-ctype "core::FileScope_O" :layout-offset-field-names ("_pathname")}
-{fixed-field :offset-type-cxx-identifier "RAW_POINTER_OFFSET" :offset-ctype "UnknownType"
-             :offset-base-ctype "core::FileScope_O"
-             :layout-offset-field-names ("_PermanentPathName")}
-{fixed-field :offset-type-cxx-identifier "RAW_POINTER_OFFSET" :offset-ctype "UnknownType"
-             :offset-base-ctype "core::FileScope_O"
-             :layout-offset-field-names ("_PermanentFileName")}
 {fixed-field :offset-type-cxx-identifier "ctype_int" :offset-ctype "int"
              :offset-base-ctype "core::FileScope_O" :layout-offset-field-names ("_FileHandle")}
 {class-kind :stamp-name "STAMPWTAG_core__Path_O" :stamp-key "core::Path_O"