From 44ed044308c69e2efd17185e8d31ccb62f8e1a3c Mon Sep 17 00:00:00 2001
From: zys <zys@zysdeMBP.lan>
Date: Thu, 4 Oct 2018 23:25:12 +0800
Subject: [PATCH] modify2bugs

---
 src/memory/heap.cpp         | 1 +
 src/memory/heap.hpp         | 1 -
 src/runtime/interpreter.cpp | 1 +
 src/util/map.cpp            | 2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/memory/heap.cpp b/src/memory/heap.cpp
index a0fbbcc..0816210 100644
--- a/src/memory/heap.cpp
+++ b/src/memory/heap.cpp
@@ -1,6 +1,7 @@
 #include "runtime/universe.hpp"
 #include "memory/heap.hpp"
 #include "memory/oopClosure.hpp"
+#include <stdlib.h>
 
 Heap*  Heap::instance = NULL;
 size_t Heap::MAX_CAP = 2 * 1024 * 1024;
diff --git a/src/memory/heap.hpp b/src/memory/heap.hpp
index ff5d4d8..2e9a32d 100644
--- a/src/memory/heap.hpp
+++ b/src/memory/heap.hpp
@@ -2,7 +2,6 @@
 #define MEMORY_HEAP_HPP
 
 #include <memory.h>
-#include <malloc.h>
 
 class HiObject;
 
diff --git a/src/runtime/interpreter.cpp b/src/runtime/interpreter.cpp
index 1eb0172..0fd30cc 100644
--- a/src/runtime/interpreter.cpp
+++ b/src/runtime/interpreter.cpp
@@ -267,6 +267,7 @@ void Interpreter::eval_frame() {
                 printf("\n");
                 break;
 
+            case ByteCode::INPLACE_ADD:
             case ByteCode::BINARY_ADD:
                 v = POP();
                 w = POP();
diff --git a/src/util/map.cpp b/src/util/map.cpp
index d44971a..f6c9627 100644
--- a/src/util/map.cpp
+++ b/src/util/map.cpp
@@ -73,7 +73,7 @@ template <typename K, typename V>
 V Map<K, V>::remove(K k) {
     int i = index(k);
 
-    if (k < 0)
+    if (i < 0)
         return 0; 
 
     V v = _entries[i]._v;
-- 
Gitee