src: make Symbol more resilient

mmarchini · mmarchini · commit 1b8f14336923 · 2020-01-21T14:14:35.000-08:00
Instead of crashing if llnode fails to parse a Symbol, just return a ??? token. PR-URL: #330 Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
diff --git a/src/llv8-constants.cc b/src/llv8-constants.cc
@@ -550,7 +550,7 @@ void Frame::Load() {
 
 
 void Symbol::Load() {
-  kNameOffset = LoadConstant("class_Symbol__name__Object");
+  kNameOffset = LoadConstant({"class_Symbol__name__Object"});
 }
 
 
diff --git a/src/llv8-constants.h b/src/llv8-constants.h
@@ -509,7 +509,7 @@ class Symbol : public Module {
  public:
   CONSTANTS_DEFAULT_METHODS(Symbol);
 
-  int64_t kNameOffset;
+  Constant<int64_t> kNameOffset;
 
  protected:
   void Load();
diff --git a/src/llv8-inl.h b/src/llv8-inl.h
@@ -281,7 +281,7 @@ ACCESSOR(Map, MaybeConstructor, map()->kMaybeConstructorOffset, HeapObject)
 SAFE_ACCESSOR(Map, InstanceDescriptors, map()->kInstanceDescriptorsOffset,
               HeapObject)
 
-ACCESSOR(Symbol, Name, symbol()->kNameOffset, HeapObject)
+SAFE_ACCESSOR(Symbol, Name, symbol()->kNameOffset, HeapObject)
 
 inline int64_t Map::BitField3(Error& err) {
   return v8()->LoadUnsigned(LeaField(v8()->map()->kBitField3Offset), 4, err);
diff --git a/src/llv8.cc b/src/llv8.cc
@@ -729,6 +729,7 @@ std::string Symbol::ToString(Error& err) {
     return "Symbol()";
   }
   HeapObject name = Name(err);
+  RETURN_IF_INVALID(name, "Symbol(???)");
   return "Symbol('" + String(name).ToString(err) + "')";
 }
 

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ void Frame::Load() {`
`550`	`550`
`551`	`551`
`552`	`552`	`void Symbol::Load() {`
`553`		`- kNameOffset = LoadConstant("class_Symbol__name__Object");`
	`553`	`+ kNameOffset = LoadConstant({"class_Symbol__name__Object"});`
`554`	`554`	`}`
`555`	`555`
`556`	`556`
Original file line number	Diff line number	Diff line change
`@@ -729,6 +729,7 @@ std::string Symbol::ToString(Error& err) {`
`729`	`729`	`return "Symbol()";`
`730`	`730`	`}`
`731`	`731`	`HeapObject name = Name(err);`
	`732`	`+ RETURN_IF_INVALID(name, "Symbol(???)");`
`732`	`733`	`return "Symbol('" + String(name).ToString(err) + "')";`
`733`	`734`	`}`
`734`	`735`